3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-16 10:42:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

added basic signal handling: this allows to see how far did we go in our testing if, eg. the code under test hits a seg-fault

Browse Source
This commit is contained in:
Lukasz Forynski 2013-04-03 15:02:51 +01:00
parent 5c7d3d75cc
commit fc90fa92ac
4 changed files with 128 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,6 +1,6 @@
![catch logo](https://raw.github.com/philsquared/Catch/Integration/catch-logo-small.png)
## CATCH v0.9 build 30 (integration branch)
## CATCH v0.9 build 31 (integration branch)
An automated test framework for C, C++ and Objective-C.
This branch may contain code that is experimental or not yet fully tested.

64
include/internal/catch_default_main.hpp
View File

@ -10,9 +10,69 @@
#ifndef __OBJC__
#ifndef DO_NOT_USE_SIGNALS
#include <signal.h>
#include <iostream>
#include <sstream>
// handler for signals
void handle_signal(int sig) {
std::stringstream s;
s << "\n\n=================\n\n";
switch (sig) {
case SIGINT:
s << "Interactive attention";
break;
case SIGILL:
s << "Illegal instruction";
break;
case SIGFPE:
s << "Floating point error";
break;
case SIGSEGV:
s << "Segmentation violation";
break;
case SIGTERM:
s << "Termination request";
break;
case SIGABRT:
s << "Abnormal termination (abort)";
break;
default:
break;
}
// print info about current test
Catch::IResultCapture& result = Catch::getCurrentContext().getResultCapture();
const Catch::AssertionResult* r = result.getLastResult();
s << "\n\nwhile executing test: \"" << result.getCurrentTestName() << "\"\n";
s << "\n(last successful check was: \"" << r->getExpression() << "\"\n";
s << " in: " << r->getSourceInfo().file << ", ";
s << "line: " << static_cast<int>(r->getSourceInfo().line) << ")\n\n";
std::cout << s.str();
Catch::cleanUp();
exit(-sig);
}
#endif /*!DO_NOT_USE_SIGNALS*/
// Standard C/C++ main entry point
int main (int argc, char * const argv[]) {
return Catch::Main( argc, argv );
int main(int argc, char* const argv[]) {
#ifndef DO_NOT_USE_SIGNALS
signal(SIGSEGV, handle_signal);
signal(SIGABRT, handle_signal);
signal(SIGINT, handle_signal);
signal(SIGILL, handle_signal);
signal(SIGFPE, handle_signal);
signal(SIGSEGV, handle_signal);
signal(SIGTERM, handle_signal);
signal(SIGABRT, handle_signal);
#endif /*!DO_NOT_USE_SIGNALS*/
return Catch::Main(argc, argv);
}
#else // __OBJC__

2
include/internal/catch_version.hpp
View File

@ -13,7 +13,7 @@
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 0, 9, 30, "integration" );
Version libraryVersion( 0, 9, 31, "integration" );
}
#endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED

69
single_include/catch.hpp
View File

@ -1,6 +1,6 @@
/*
* CATCH v0.9 build 30 (integration branch)
* Generated: 2013-04-01 11:26:11.785709
* CATCH v0.9 build 31 (integration branch)
* Generated: 2013-04-03 15:00:33.606753
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@ -6077,7 +6077,7 @@ namespace Catch {
namespace Catch {
// These numbers are maintained by a script
Version libraryVersion( 0, 9, 30, "integration" );
Version libraryVersion( 0, 9, 31, "integration" );
}
// #included from: catch_line_wrap.hpp
@ -7639,9 +7639,68 @@ namespace Catch {
#ifndef __OBJC__
#ifndef DO_NOT_USE_SIGNALS
#include <signal.h>
#include <iostream>
#include <sstream>
// handler for signals
void handle_signal(int sig) {
std::stringstream s;
s << "\n\n=================\n\n";
switch (sig) {
case SIGINT:
s << "Interactive attention";
break;
case SIGILL:
s << "Illegal instruction";
break;
case SIGFPE:
s << "Floating point error";
break;
case SIGSEGV:
s << "Segmentation violation";
break;
case SIGTERM:
s << "Termination request";
break;
case SIGABRT:
s << "Abnormal termination (abort)";
break;
default:
break;
}
// print info about current test
Catch::IResultCapture& result = Catch::getCurrentContext().getResultCapture();
const Catch::AssertionResult* r = result.getLastResult();
s << "\n\nwhile executing test: \"" << result.getCurrentTestName() << "\"\n";
s << "\n(last successful check was: \"" << r->getExpression() << "\"\n";
s << " in: " << r->getSourceInfo().file << ", ";
s << "line: " << static_cast<int>(r->getSourceInfo().line) << ")\n\n";
std::cout << s.str();
Catch::cleanUp();
exit(-sig);
}
#endif /*!DO_NOT_USE_SIGNALS*/
// Standard C/C++ main entry point
int main (int argc, char * const argv[]) {
return Catch::Main( argc, argv );
int main(int argc, char* const argv[]) {
#ifndef DO_NOT_USE_SIGNALS
signal(SIGSEGV, handle_signal);
signal(SIGABRT, handle_signal);
signal(SIGINT, handle_signal);
signal(SIGILL, handle_signal);
signal(SIGFPE, handle_signal);
signal(SIGSEGV, handle_signal);
signal(SIGTERM, handle_signal);
signal(SIGABRT, handle_signal);
#endif /*!DO_NOT_USE_SIGNALS*/
return Catch::Main(argc, argv);
}
#else // __OBJC__