* add missing NULL argument to fail* varargs macro calls

* define incorrect tests for __GNUC__ only
   -- both per Roland Illig in bug 1677391

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

diff --git a/AUTHORS b/AUTHORS
index b70b0e3457c004cb54390b72fdf3efbb8d865861..40016184e35bd79a99171e4bc730baeb065552ff 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ Patches:         Bernhard Reiter (configure issues)
                 Ross Burton (pkg-config patch)
                 Roland Stigge (bug fix: allow fail inside setup)
                 Torok Edwin (strsignal and build fixes)
+                Roland Illig (portability fixes for varargs calls)
 
 Anybody who has contributed code to Check or Check's build system is
 considered an author.  Send patches to this file to 

diff --git a/tests/check_check_master.c b/tests/check_check_master.c
index 0d6da689c8a58e7666959664d30c94ce57bf13fc..43763ae6f7b1a7e52f239680c6d7d898332e9190 100644 (file)
--- a/tests/check_check_master.c
+++ b/tests/check_check_master.c
@@ -133,9 +133,9 @@ START_TEST(test_check_failure_msgs)
       continue;
     }
 
-    fail_if(i - passed > sub_nfailed);
+    fail_if(i - passed > sub_nfailed, NULL);
     tr = tr_fail_array[i - passed];
-    fail_unless(tr != NULL);
+    fail_unless(tr != NULL, NULL);
     got_msg = tr_msg(tr);
     expected_msg = master_tests[i].msg;
     if (strcmp(got_msg, expected_msg) != 0) {      
@@ -162,9 +162,9 @@ START_TEST(test_check_failure_lnos)
       continue;
     }
 
-    fail_if(i - passed > sub_nfailed);
+    fail_if(i - passed > sub_nfailed, NULL);
     tr = tr_fail_array[i - passed];
-    fail_unless(tr != NULL);
+    fail_unless(tr != NULL, NULL);
     line_no = master_tests[i].line_nos;
     if (line_no > 0 && tr_lno(tr) != line_no) {
       char *emsg = malloc(MAXSTR);
@@ -189,9 +189,9 @@ START_TEST(test_check_failure_ftypes)
       continue;
     }
 
-    fail_if(i - passed > sub_nfailed);
+    fail_if(i - passed > sub_nfailed, NULL);
     tr = tr_fail_array[i - passed];
-    fail_unless(tr != NULL);
+    fail_unless(tr != NULL, NULL);
     fail_unless(master_tests[i].failure_type == tr_rtype(tr),
                 "Failure type wrong for test %d", i);
   }
@@ -203,7 +203,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);
+    fail_unless(tr != NULL, 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 14a0939bfe42ab0a0fd99898f6ed1ce42f537b41..bb367bb6ac149582f24b881377b73374b13f788d 100644 (file)
--- a/tests/check_check_sub.c
+++ b/tests/check_check_sub.c
@@ -32,7 +32,7 @@ START_TEST(test_pass)
   fail_unless(9999, "This test should pass");
 }
 END_TEST
-
+/* FIXME: this should really be called test_fail_unless */
 START_TEST(test_fail)
 {
   fail_unless(1 == 2, "This test should fail");
@@ -58,26 +58,26 @@ START_TEST(test_fail_null_msg)
 }
 END_TEST
 
-
+#if defined(__GNUC__)
 START_TEST(test_fail_no_msg)
 {
   fail_unless(4 == 5);
 }
 END_TEST
-
+#endif /* __GNUC__ */
 START_TEST(test_fail_if_null_msg)
 {
   fail_if(2 != 3, NULL);
 }
 END_TEST
 
-
+#if defined(__GNUC__)
 START_TEST(test_fail_if_no_msg)
 {
   fail_if(4 != 5);
 }
 END_TEST
-
+#endif /* __GNUC__ */
 START_TEST(test_fail_vararg_msg_1)
 {
   int x = 3;
@@ -101,13 +101,13 @@ START_TEST(test_fail_vararg_msg_3)
   fail("%d == %d", x, y);
 }
 END_TEST
-
+#if defined(__GNUC__)
 START_TEST(test_fail_empty)
 { /* plain fail() doesn't compile with xlc in C mode because of `, ## __VA_ARGS__' problem */
-  fail(NULL);
+  fail();
 }
 END_TEST
-
+#endif /* __GNUC__ */
 /* FIXME: all these line numbers are kind of hard to maintain */
 START_TEST(test_ck_abort)
 {
@@ -318,7 +318,7 @@ START_TEST(test_fork1p_pass)
   if((pid = fork()) < 0) {
     fail("Failed to fork new process");
   } else if (pid > 0) {
-    fail_unless(1);
+    fail_unless(1, NULL);
     kill(pid, SIGKILL);
   } else {
     for (;;) {
@@ -354,7 +354,7 @@ START_TEST(test_fork1c_pass)
   } else if (pid > 0) {
     check_waitpid_and_exit(pid);
   } else {
-    fail_unless(1);
+    fail_unless(1, NULL);
     check_waitpid_and_exit(0);
   }
 }
@@ -385,7 +385,7 @@ START_TEST(test_fork2_pass)
     if((pid2 = check_fork()) < 0) {
       fail("Failed to fork new process");
     } else if (pid2 == 0) {
-      fail_unless(1);
+      fail_unless(1, NULL);
       check_waitpid_and_exit(0);
     }
     check_waitpid_and_exit(pid2);
@@ -421,21 +421,21 @@ START_TEST(test_srunner)
   SRunner *sr;
 
   s = suite_create("Check Servant3");
-  fail_unless(s != NULL);
+  fail_unless(s != NULL, NULL);
   sr = srunner_create(NULL);
-  fail_unless(sr != NULL);
+  fail_unless(sr != NULL, NULL);
   srunner_add_suite(sr, s);
   srunner_free(sr);
 
   sr = srunner_create(NULL);
-  fail_unless(sr != NULL);
+  fail_unless(sr != NULL, NULL);
   srunner_add_suite(sr, NULL);
   srunner_free(sr);
 
   s = suite_create("Check Servant3");
-  fail_unless(s != NULL);
+  fail_unless(s != NULL, NULL);
   sr = srunner_create(s);
-  fail_unless(sr != NULL);
+  fail_unless(sr != NULL, NULL);
   srunner_free(sr);
 }
 END_TEST
@@ -504,13 +504,19 @@ 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);
+#if defined(__GNUC__)
   tcase_add_test (tc_simple, test_fail_no_msg);
+#endif /* __GNUC__ */
   tcase_add_test (tc_simple, test_fail_if_null_msg);
+#if defined(__GNUC__)
   tcase_add_test (tc_simple, test_fail_if_no_msg);
+#endif /* __GNUC__ */
   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);
+#if defined(__GNUC__)
   tcase_add_test (tc_simple, test_fail_empty);
+#endif /* __GNUC__ */
 
   tcase_add_test (tc_simple, test_ck_abort);
   tcase_add_test (tc_simple, test_ck_abort_msg);