catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Use inline assembly with gcc under Linux for CATCH_TRAP
- Commit
e1c4a4bd9b4507c86643ac825deb61da047f53e1- Author
- Vadim Zeitlin ·
- Committer
- Martin Hořeňovský
- Parents
25d017763b73
Changes
include/internal/catch_debugger.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/include/internal/catch_debugger.h b/include/internal/catch_debugger.h index 4c83efd2..060cbc90 100644 --- a/include/internal/catch_debugger.h +++ b/include/internal/catch_debugger.h @@ -34,9 +34,16 @@ namespace Catch{ #endif #elif defined(CATCH_PLATFORM_LINUX) - #include <signal.h> - - #define CATCH_TRAP() raise(SIGTRAP) + // If we can use inline assembler, do it because this allows us to break + // directly at the location of the failing check instead of breaking inside + // raise() called from it, i.e. one stack frame below. + #if defined(__GNUC__) && (defined(__i386) || defined(__x86_64)) + #define CATCH_TRAP() asm volatile ("int $3") + #else // Fall back to the generic way. + #include <signal.h> + + #define CATCH_TRAP() raise(SIGTRAP) + #endif #elif defined(_MSC_VER) #define CATCH_TRAP() __debugbreak() #elif defined(__MINGW32__)