* Reverted back to r378, undoing the -ansi and -pedantic fixes.

   Now the tests shall work again.

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@391 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/tests/check_check_master.c b/tests/check_check_master.c
index fdf58ba0c73ddb95b44c1d1cf3bce50519338b33..045cbfe2533257d0d41817131fe28afd23e1ce87 100644 (file)
--- a/tests/check_check_master.c
+++ b/tests/check_check_master.c
@@ -123,9 +123,9 @@ START_TEST(test_check_failure_msgs)
       continue;
     }
 
-    fail_if(i - passed > sub_nfailed, NULL);
+    fail_if(i - passed > sub_nfailed);
     tr = tr_fail_array[i - passed];
-    fail_unless(tr != NULL, NULL);
+    fail_unless(tr != NULL);
     got_msg = tr_msg(tr);
     expected_msg = master_tests[i].msg;
     if (strcmp(got_msg, expected_msg) != 0) {      
@@ -152,9 +152,9 @@ START_TEST(test_check_failure_lnos)
       continue;
     }
 
-    fail_if(i - passed > sub_nfailed, NULL);
+    fail_if(i - passed > sub_nfailed);
     tr = tr_fail_array[i - passed];
-    fail_unless(tr != NULL, NULL);
+    fail_unless(tr != NULL);
     line_no = master_tests[i].line_nos;
     if (line_no > 0 && tr_lno(tr) != line_no) {
       char *emsg = malloc(MAXSTR);
@@ -179,9 +179,9 @@ START_TEST(test_check_failure_ftypes)
       continue;
     }
 
-    fail_if(i - passed > sub_nfailed, NULL);
+    fail_if(i - passed > sub_nfailed);
     tr = tr_fail_array[i - passed];
-    fail_unless(tr != NULL, NULL);
+    fail_unless(tr != NULL);
     fail_unless(master_tests[i].failure_type == tr_rtype(tr),
                 "Failure type wrong for test %d", i);
   }
@@ -193,7 +193,7 @@ START_TEST(test_check_failure_lfiles)
   int i;
   for (i = 0; i < sub_nfailed; i++) {
     TestResult *tr = tr_fail_array[i];
-    fail_unless(tr != NULL, NULL);
+    fail_unless(tr != NULL);
     fail_unless(tr_lfile(tr) != NULL, "Bad file name for test %d", i);
     fail_unless(strstr(tr_lfile(tr), "check_check_sub.c") != 0,
                 "Bad file name for test %d", i);

diff --git a/tests/check_check_sub.c b/tests/check_check_sub.c
index e770de4fc6e894c032a99234ab151a0024f49aee..a7d4883ea598d5ea6ce2ac6bebdcacaff7b78604 100644 (file)
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -58,12 +58,26 @@ START_TEST(test_fail_null_msg)
 }
 END_TEST
 
+
+START_TEST(test_fail_no_msg)
+{
+  fail_unless(4 == 5);
+}
+END_TEST
+
 START_TEST(test_fail_if_null_msg)
 {
   fail_if(2 != 3, NULL);
 }
 END_TEST
 
+
+START_TEST(test_fail_if_no_msg)
+{
+  fail_if(4 != 5);
+}
+END_TEST
+
 START_TEST(test_fail_vararg_msg_1)
 {
   int x = 3;
@@ -88,9 +102,9 @@ START_TEST(test_fail_vararg_msg_3)
 }
 END_TEST
 
-START_TEST(test_fail_empty_null_msg)
+START_TEST(test_fail_empty)
 {
-  fail(NULL);
+  fail();
 }
 END_TEST
 
@@ -187,7 +201,7 @@ START_TEST(test_fork1p_pass)
   if((pid = fork()) < 0) {
     fail("Failed to fork new process");
   } else if (pid > 0) {
-    fail_unless(1, NULL);
+    fail_unless(1);
     kill(pid, SIGKILL);
   } else {
     for (;;) {
@@ -223,7 +237,7 @@ START_TEST(test_fork1c_pass)
   } else if (pid > 0) {
     check_waitpid_and_exit(pid);
   } else {
-    fail_unless(1, NULL);
+    fail_unless(1);
     check_waitpid_and_exit(0);
   }
 }
@@ -254,7 +268,7 @@ START_TEST(test_fork2_pass)
     if((pid2 = check_fork()) < 0) {
       fail("Failed to fork new process");
     } else if (pid2 == 0) {
-      fail_unless(1, NULL);
+      fail_unless(1);
       check_waitpid_and_exit(0);
     }
     check_waitpid_and_exit(pid2);
@@ -347,11 +361,13 @@ Suite *make_sub_suite(void)
   tcase_add_test (tc_simple, test_fail_if_pass);
   tcase_add_test (tc_simple, test_fail_if_fail);
   tcase_add_test (tc_simple, test_fail_null_msg);
+  tcase_add_test (tc_simple, test_fail_no_msg);
   tcase_add_test (tc_simple, test_fail_if_null_msg);
+  tcase_add_test (tc_simple, test_fail_if_no_msg);
   tcase_add_test (tc_simple, test_fail_vararg_msg_1);
   tcase_add_test (tc_simple, test_fail_vararg_msg_2);
   tcase_add_test (tc_simple, test_fail_vararg_msg_3);
-  tcase_add_test (tc_simple, test_fail_empty_null_msg);
+  tcase_add_test (tc_simple, test_fail_empty);
 
   tcase_add_test (tc_signal, test_segv);
   tcase_add_test_raise_signal (tc_signal, test_segv, 11); /* pass  */