From: Arvin Schnell <aschnell@suse.de>
Date: Thu, 17 Feb 2011 16:32:01 +0000 (+0100)
Subject: - nicer check_equal macro
X-Git-Tag: v0.1.3~476
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4e2b55f70eea94ad5c40c8b9df07df89858cea3;p=thirdparty%2Fsnapper.git

- nicer check_equal macro
---

diff --git a/testsuite-real/Makefile.am b/testsuite-real/Makefile.am
index 626ca491..0b3b825b 100644
--- 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 d217d21a..e61e54bd 100644
--- 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 064a76a6..c0679812 100644
--- 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__);				\