Merge libtest.

[m6w6/libmemcached] / libtest / unittest.cc

diff --git a/libtest/unittest.cc b/libtest/unittest.cc
index 834614fcbc4fb3fe4fed08488afda467d887d5f8..1663e59a6311a41cdd423e5cdfa818c3bd291f54 100644 (file)
--- a/libtest/unittest.cc
+++ b/libtest/unittest.cc
@@ -181,14 +181,19 @@ static test_return_t test_throw_fail_TEST(void *)
 }
 #pragma GCC diagnostic ignored "-Wstack-protector"
 
+#ifdef __clang__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wformat-security"
+#endif
+
 static test_return_t ASSERT_FALSE__TEST(void *)
 {
   try {
-    ASSERT_FALSE_(true, __func__);
+    ASSERT_FALSE(true);
   }
   catch (const libtest::__failure& e)
   {
-    ASSERT_STREQ(e.what(), "Assertion '!true' [ ASSERT_FALSE__TEST ]");
+    ASSERT_STREQ(e.what(), "Assertion '!true'");
     return TEST_SUCCESS;
   }
   catch (...)
@@ -199,6 +204,10 @@ static test_return_t ASSERT_FALSE__TEST(void *)
   return TEST_FAILURE;
 }
 
+#ifdef __clang__
+# pragma GCC diagnostic pop
+#endif
+
 static test_return_t ASSERT_NEQ_FAIL_TEST(void *)
 {
   try {