save

[protos/libecoli.git] / lib / ecoli_test.h

diff --git a/lib/ecoli_test.h b/lib/ecoli_test.h
index 0115837..1cebe95 100644 (file)
--- a/lib/ecoli_test.h
+++ b/lib/ecoli_test.h
@@ -74,15 +74,19 @@ int ec_test_one(const char *name);
 int ec_test_check_parse(struct ec_node *node, int expected, ...);
 
 #define EC_TEST_ERR(fmt, ...)                                          \
-       ec_log(EC_LOG_ERR, "%s:%d: error: " fmt "\n",                   \
+       EC_LOG(EC_LOG_ERR, "%s:%d: error: " fmt "\n",                   \
                __FILE__, __LINE__, ##__VA_ARGS__);                     \
 
-#define EC_TEST_ASSERT(cond, args...)                                  \
+/* XXX this is not an assert, it does not abort */
+#define EC_TEST_ASSERT_STR(cond, fmt, ...)                             \
        do {                                                            \
                if (!(cond))                                            \
-                       EC_TEST_ERR("assertion failure: " #cond);       \
+                       EC_TEST_ERR("assert failure: (" #cond ") " fmt, \
+                               ##__VA_ARGS__);                         \
        } while (0)
 
+#define EC_TEST_ASSERT(cond) EC_TEST_ASSERT_STR(cond, "")
+
 /* node, input, [expected1, expected2, ...] */
 #define EC_TEST_CHECK_PARSE(node, args...) ({                          \
        int ret_ = ec_test_check_parse(node, args, EC_NODE_ENDLIST);    \