Always check HAVE_FORK==1 if defined

For autotools this is not an issue, as HAVE_FORK is only
defined if fork is available, and thus HAVE_FORK==1.

Cmake, though, will define it either way, so it is possible
for HAVE_FORK==0. Most of these were caught earlier, but
a few were missed.

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

diff --git a/tests/check_check_fixture.c b/tests/check_check_fixture.c
index ccfcd6072ec6689e3321a54ce575c6a14c7d8359..9da308b5a8d8df4556f504dd10fb88ca84359d31 100644 (file)
--- a/tests/check_check_fixture.c
+++ b/tests/check_check_fixture.c
@@ -79,7 +79,7 @@ START_TEST(test_setup_failure_msg)
 }
 END_TEST
 
-#if defined(HAVE_FORK)
+#if defined(HAVE_FORK) && HAVE_FORK==1
 int testval_up;
 int testval_down;
 
@@ -548,7 +548,7 @@ Suite *make_fixture_suite (void)
   tcase_add_test(tc,test_print_counts);
   tcase_add_test(tc,test_setup_failure_msg);
 
-#if defined(HAVE_FORK)
+#if defined(HAVE_FORK) && HAVE_FORK==1
   tcase_add_test(tc,test_ch_setup);
   tcase_add_test(tc,test_ch_setup_fail);
   tcase_add_test(tc,test_ch_setup_fail_nofork);

diff --git a/tests/check_check_fork.c b/tests/check_check_fork.c
index 6eb575cbc299d831381c41f9f6781565bab34237..3316dc481debba1eb5d412b9c28aa6e0caf71fdd 100644 (file)
--- a/tests/check_check_fork.c
+++ b/tests/check_check_fork.c
@@ -71,7 +71,7 @@ void fork_teardown (void)
 
 START_TEST(test_default_fork)
 {
-#if defined(HAVE_FORK)
+#if defined(HAVE_FORK) && HAVE_FORK == 1
   ck_assert_msg(srunner_fork_status(fork_dummy_sr) == CK_FORK,
              "Default fork status not set correctly");
 #else
@@ -94,7 +94,7 @@ END_TEST
  * attempting to set the fork mode as anything but
  * CK_NOFORK is considered an error.
  */
-#if defined(HAVE_FORK)
+#if defined(HAVE_FORK) && HAVE_FORK==1
 START_TEST(test_set_fork)
 {
   srunner_set_fork_status(fork_dummy_sr, CK_FORK);
@@ -139,7 +139,7 @@ Suite *make_fork_suite(void)
   suite_add_tcase(s, tc);
   tcase_add_test(tc,test_default_fork);
   tcase_add_test(tc,test_set_nofork);
-#if defined(HAVE_FORK)
+#if defined(HAVE_FORK) && HAVE_FORK==1
   tcase_add_test(tc,test_set_fork);
   tcase_add_test(tc,test_env);
   tcase_add_test(tc,test_env_and_set);

diff --git a/tests/check_check_main.c b/tests/check_check_main.c
index 70643b3cf8a834dd3d25596ce30e7b84a35c77c2..17a84a58c7805a29da96a860e649c3ea8914d1a0 100644 (file)
--- a/tests/check_check_main.c
+++ b/tests/check_check_main.c
@@ -24,7 +24,7 @@ int main (void)
   srunner_add_suite(sr, make_fixture_suite());
   srunner_add_suite(sr, make_pack_suite());
 
-#if defined(HAVE_FORK)
+#if defined(HAVE_FORK) && HAVE_FORK==1
   srunner_add_suite(sr, make_exit_suite());
 #endif
 

diff --git a/tests/check_mem_leaks.c b/tests/check_mem_leaks.c
index d973e5be70e47d1c8c539bd093158afcbc04fd5e..718c208673a8f2f7f1805fcdd50a97169fb6ae8b 100644 (file)
--- a/tests/check_mem_leaks.c
+++ b/tests/check_mem_leaks.c
@@ -43,7 +43,7 @@ int main (int argc, char **argv)
     sr = srunner_create (make_log_suite());
     srunner_add_suite(sr, make_fork_suite());
 
-#if defined(HAVE_FORK)
+#if defined(HAVE_FORK) && HAVE_FORK==1
     srunner_add_suite(sr, make_exit_suite());
 #endif