Fix SignalHandlerTest with ASAN

Reviewed By: yfeldblum

Differential Revision: D6503762

fbshipit-source-id: f82b88c401979761053004eadd2e4c6a74f05f9c

diff --git a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
index 899f3809dade37b5db26cebc7c53b0af00ffa939..1a8fae6b18bc56955e60684c8fef5335c5d48b21 100644 (file)
--- a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
+++ b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
@@ -48,13 +48,6 @@ TEST(SignalHandler, Simple) {
   installFatalSignalHandler();
   installFatalSignalCallbacks();
 
   installFatalSignalHandler();
   installFatalSignalCallbacks();
 

-#ifdef FOLLY_SANITIZE_ADDRESS
-  EXPECT_DEATH(
-      failHard(),
-      // Testing an ASAN-enabled binary evokes a different diagnostic.
-      // Use a regexp that requires only the first line of that output:
-      "^ASAN:SIGSEGV\n.*");
-#else

   EXPECT_DEATH(
       failHard(),
       "^\\*\\*\\* Aborted at [0-9]+ \\(Unix time, try 'date -d @[0-9]+'\\) "
   EXPECT_DEATH(
       failHard(),
       "^\\*\\*\\* Aborted at [0-9]+ \\(Unix time, try 'date -d @[0-9]+'\\) "


@@ -71,8 +64,8 @@ TEST(SignalHandler, Simple) {
       ".*    @ [0-9a-f]+.* main.*\n"
       ".*\n"
       "Callback1\n"
       ".*    @ [0-9a-f]+.* main.*\n"
       ".*\n"
       "Callback1\n"

-      "Callback2\n");
-#endif
+      "Callback2\n"
+      ".*");

 }
 } // namespace test
 } // namespace symbolizer
 }
 } // namespace test
 } // namespace symbolizer