From 074bdb7fc4a747c13d54e1ee5e652a50a18a19f4 Mon Sep 17 00:00:00 2001 From: ptarjan Date: Tue, 8 Apr 2014 21:13:38 -0700 Subject: [PATCH] Make header compatible with warp --- folly/experimental/symbolizer/test/SignalHandlerTest.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp index cc1a19a7..3fbb52a3 100644 --- a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp +++ b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp @@ -48,13 +48,15 @@ TEST(SignalHandler, Simple) { installFatalSignalHandler(); installFatalSignalCallbacks(); +#ifdef FOLLY_SANITIZE_ADDRESS EXPECT_DEATH( failHard(), -#ifdef FOLLY_SANITIZE_ADDRESS // Testing an ASAN-enabled binary evokes a different diagnostic. // Use a regexp that requires only the first line of that output: - "^ASAN:SIGSEGV\n.*" + "^ASAN:SIGSEGV\n.*"); #else + EXPECT_DEATH( + failHard(), "^\\*\\*\\* Aborted at [0-9]+ \\(Unix time, try 'date -d @[0-9]+'\\) " "\\*\\*\\*\n" "\\*\\*\\* Signal 11 \\(SIGSEGV\\) \\(0x2a\\) received by PID [0-9]+ " @@ -67,8 +69,8 @@ TEST(SignalHandler, Simple) { ".*\n" "Callback1\n" "Callback2\n" -#endif ); +#endif } -- 2.34.1