projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d92b1b9
)
Make header compatible with warp
author
ptarjan
<ptarjan@fb.com>
Wed, 9 Apr 2014 04:13:38 +0000
(21:13 -0700)
committer
ptarjan
<ptarjan@fb.com>
Wed, 9 Apr 2014 04:15:02 +0000
(21:15 -0700)
folly/experimental/symbolizer/test/SignalHandlerTest.cpp
patch
|
blob
|
history
diff --git
a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
index cc1a19a7d456786931991da554e9aee1372052cb..3fbb52a3fc76531d66655c710928690fb86d171b 100644
(file)
--- a/
folly/experimental/symbolizer/test/SignalHandlerTest.cpp
+++ b/
folly/experimental/symbolizer/test/SignalHandlerTest.cpp
@@
-48,13
+48,15
@@
TEST(SignalHandler, Simple) {
installFatalSignalHandler();
installFatalSignalCallbacks();
installFatalSignalHandler();
installFatalSignalCallbacks();
+#ifdef FOLLY_SANITIZE_ADDRESS
EXPECT_DEATH(
failHard(),
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:
// 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
#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]+ "
"^\\*\\*\\* 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"
".*\n"
"Callback1\n"
"Callback2\n"
-#endif
);
);
+#endif
}
}