From 4a9ddc04621c4f9229cddc20f8607d9f7ac93681 Mon Sep 17 00:00:00 2001 From: hugo303 Date: Tue, 9 Nov 2004 13:38:47 +0000 Subject: [PATCH] Changed failure message for fail_if git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@198 64e312b2-a51f-0410-8e61-82d0ca0eb02a --- check/ChangeLog | 5 +++++ check/src/check.h.in | 2 +- check/tests/check_check_master.c | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/check/ChangeLog b/check/ChangeLog index 5a0f1e9..515e118 100644 --- a/check/ChangeLog +++ b/check/ChangeLog @@ -1,3 +1,8 @@ +2004-11-09 hugo303 + + * tests/check_check_master.c src/check.h.in: + Changed failure message for fail_if. + 2004-11-09 hugo303 * src/check.c, src/check.h.in, src/check_impl.h, src/check_run.c, diff --git a/check/src/check.h.in b/check/src/check.h.in index 11e0508..09f4c8c 100644 --- a/check/src/check.h.in +++ b/check/src/check.h.in @@ -168,7 +168,7 @@ static void __testname (void)\ /* Fail the test case if expr is true */ #define fail_if(expr, ...)\ _fail_unless(!(expr), __FILE__, __LINE__,\ - "Assertion '"#expr"' failed", ## __VA_ARGS__, NULL) + "Failure '"#expr"' occured", ## __VA_ARGS__, NULL) /* Always fail */ #define fail(...) _fail_unless(0, __FILE__, __LINE__, "Failed" , ## __VA_ARGS__, NULL) diff --git a/check/tests/check_check_master.c b/check/tests/check_check_master.c index 6f8cc00..b7002a0 100644 --- a/check/tests/check_check_master.c +++ b/check/tests/check_check_master.c @@ -27,8 +27,8 @@ static master_test_t master_tests[] = { { "Simple Tests", -1, CK_FAILURE, "This test should fail" }, { "Simple Tests", -1, CK_FAILURE, "Assertion '2 == 3' failed" }, { "Simple Tests", -1, CK_FAILURE, "Assertion '4 == 5' failed" }, - { "Simple Tests", -1, CK_FAILURE, "Assertion '2 != 3' failed" }, - { "Simple Tests", -1, CK_FAILURE, "Assertion '4 != 5' failed" }, + { "Simple Tests", -1, CK_FAILURE, "Failure '2 != 3' occured" }, + { "Simple Tests", -1, CK_FAILURE, "Failure '4 != 5' occured" }, { "Simple Tests", -1, CK_FAILURE, "3 != 4" }, { "Simple Tests", -1, CK_FAILURE, "5 != 6" }, { "Simple Tests", -1, CK_FAILURE, "7 == 7" }, -- 2.50.0