Fix folly conversions for Clang with GCC5's libstdc++

[folly.git] / folly / test / SafeAssertTest.cpp

diff --git a/folly/test/SafeAssertTest.cpp b/folly/test/SafeAssertTest.cpp
index db075411a847b5c1cb87ec205f0cf2a19c3dad78..bfaa3dd6a0da1ee93f421db345a6234acc2158f7 100644 (file)
--- a/folly/test/SafeAssertTest.cpp
+++ b/folly/test/SafeAssertTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 using namespace folly;
 
 void fail() {
-  FOLLY_SAFE_CHECK(0, "hello");
+  FOLLY_SAFE_CHECK(0 + 0, "hello");
 }
 
 void succeed() {
@@ -33,6 +33,6 @@ void succeed() {
 
 TEST(SafeAssert, AssertionFailure) {
   succeed();
-  EXPECT_DEATH(fail(), ".*Assertion failure:.*hello.*");
+  EXPECT_DEATH(fail(), "Assertion failure: 0 \\+ 0");
+  EXPECT_DEATH(fail(), "Message: hello");
 }
-