Set SASL errors correctly.

[m6w6/libmemcached] / libtest / test.h

diff --git a/libtest/test.h b/libtest/test.h
index b5f7e47d3cad9ddd7c37d68d3c51ac3778457a29..42443d9ac17cf5f52acc7b1b3d96f85f7ba4eb0b 100644 (file)
--- a/libtest/test.h
+++ b/libtest/test.h
@@ -196,7 +196,7 @@ do \
 #define test_compare_got(__expected, __actual, __hint) \
 do \
 { \
-  if (not libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint))) \
+  if (libtest::_compare_hint(__FILE__, __LINE__, __func__, (__expected), (__actual), (__hint)) == false) \
   { \
     libtest::create_core(); \
     return TEST_FAILURE; \
@@ -230,16 +230,10 @@ do \
 } while (0)
 
 
-#define test_strcmp(A,B) \
+#define test_strcmp(__expected, __actual) \
 do \
 { \
-  if ((A) == NULL or (B) == NULL or strcmp((A), (B))) \
-  { \
-    if ((B) == NULL) fprintf(stderr, "\n%s:%d: Expected %s, got <null>\n", __FILE__, __LINE__, (A)); \
-    else fprintf(stderr, "\n%s:%d: Expected %s, got \"%s\"\n", __FILE__, __LINE__, (A), (B)); \
-    libtest::create_core(); \
-    return TEST_FAILURE; \
-  } \
+  void(libtest::_compare_strcmp(__FILE__, __LINE__, __func__, (__expected), (__actual))); \
 } while (0)
 
 #define test_memcmp(A,B,C) \