Commit 074bdb7f authored by ptarjan's avatar ptarjan

Make header compatible with warp

parent d92b1b90
...@@ -48,13 +48,15 @@ TEST(SignalHandler, Simple) { ...@@ -48,13 +48,15 @@ TEST(SignalHandler, Simple) {
installFatalSignalHandler(); installFatalSignalHandler();
installFatalSignalCallbacks(); installFatalSignalCallbacks();
#ifdef FOLLY_SANITIZE_ADDRESS
EXPECT_DEATH( EXPECT_DEATH(
failHard(), failHard(),
#ifdef FOLLY_SANITIZE_ADDRESS
// Testing an ASAN-enabled binary evokes a different diagnostic. // Testing an ASAN-enabled binary evokes a different diagnostic.
// Use a regexp that requires only the first line of that output: // Use a regexp that requires only the first line of that output:
"^ASAN:SIGSEGV\n.*" "^ASAN:SIGSEGV\n.*");
#else #else
EXPECT_DEATH(
failHard(),
"^\\*\\*\\* Aborted at [0-9]+ \\(Unix time, try 'date -d @[0-9]+'\\) " "^\\*\\*\\* Aborted at [0-9]+ \\(Unix time, try 'date -d @[0-9]+'\\) "
"\\*\\*\\*\n" "\\*\\*\\*\n"
"\\*\\*\\* Signal 11 \\(SIGSEGV\\) \\(0x2a\\) received by PID [0-9]+ " "\\*\\*\\* Signal 11 \\(SIGSEGV\\) \\(0x2a\\) received by PID [0-9]+ "
...@@ -67,8 +69,8 @@ TEST(SignalHandler, Simple) { ...@@ -67,8 +69,8 @@ TEST(SignalHandler, Simple) {
".*\n" ".*\n"
"Callback1\n" "Callback1\n"
"Callback2\n" "Callback2\n"
#endif
); );
#endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment