- nicer check_equal macro

diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
index 626ca4915170d6a41c99a2fbcd8257c98fad3206..0b3b825b3a343f248259ec6e4a9227f883afb9b8 100644 (file)
--- a/testsuite-real/Makefile.am
+++ b/testsuite-real/Makefile.am
@@ -2,6 +2,8 @@
 # Makefile.am for snapper/testsuite-real
 #
 
+CXXFLAGS += -std=gnu++0x
+
 INCLUDES = -I$(top_srcdir)
 
 LDADD = ../snapper/libsnapper.la

diff --git a/testsuite-real/common.cc b/testsuite-real/common.cc
index d217d21ad61f695b1565ea6559a45cb8814fa733..e61e54bd3ec35d14ed03af97933f6185a567fe01 100644 (file)
--- a/testsuite-real/common.cc
+++ b/testsuite-real/common.cc
@@ -64,9 +64,9 @@ check_rollback_statistics(unsigned int numCreate, unsigned int numModify, unsign
 
     RollbackStatistic rs = sh->getRollbackStatistic();
 
-    check_int_equal(rs.numCreate, numCreate);
-    check_int_equal(rs.numModify, numModify);
-    check_int_equal(rs.numDelete, numDelete);
+    check_equal(rs.numCreate, numCreate);
+    check_equal(rs.numModify, numModify);
+    check_equal(rs.numDelete, numDelete);
 }
 
 

diff --git a/testsuite-real/common.h b/testsuite-real/common.h
index 064a76a6cee6acfdaeb820314236ee9c458e8c84..c0679812e2c50ab1ecc256613f807ebe9865b7d5 100644 (file)
--- a/testsuite-real/common.h
+++ b/testsuite-real/common.h
@@ -34,9 +34,9 @@ check_failure(const char* str, Type actual, Type expected, const char* file,
     } while (0)
 
 
-#define check_int_equal(expr, expected)                                        \
+#define check_equal(expr, expected)                                    \
     do {                                                               \
-       unsigned int actual = (expr);                                   \
+       typeof (expected) actual = (expr);                              \
        if (actual != expected)                                         \
            check_failure(#expr, actual, expected, __FILE__, __LINE__,  \
                          __PRETTY_FUNCTION__);                         \