Do not run test_exit if fork is unavailable

if fork is unavailable, the test is not valid, as it makes the
unit test runner exit early.

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

diff --git a/tests/ex_output.c b/tests/ex_output.c
index baf961b6ea36a590cebda183a82eea3b908d616e..cf8c617dfdd18eb427f04def5496ca623cf8b434 100644 (file)
--- a/tests/ex_output.c
+++ b/tests/ex_output.c
@@ -18,11 +18,17 @@ START_TEST(test_fail)
 }
 END_TEST
 
+/*
+ * This test will fail without fork, as it will result in the
+ * unit test runniner exiting early.
+ */
+#if defined(HAVE_FORK)
 START_TEST(test_exit)
 {
   exit(1);
 }
 END_TEST
+#endif /* HAVE_FORK */
 
 static Suite *make_suite (void)
 {
@@ -34,8 +40,9 @@ static Suite *make_suite (void)
   suite_add_tcase(s, tc);
   tcase_add_test (tc, test_pass);
   tcase_add_test (tc, test_fail);
+#if defined(HAVE_FORK)
   tcase_add_test (tc, test_exit);
-
+#endif /* HAVE_FORK */
   return s;
 }
 

diff --git a/tests/test_output.sh b/tests/test_output.sh
index f7abc38b72d6593f2e11d35a791442fd7c5c7d15..763db0366beab534f88137b9a9760510720d75e2 100755 (executable)
--- a/tests/test_output.sh
+++ b/tests/test_output.sh
@@ -14,12 +14,12 @@ t1="xRunning suite(s): Master
 t2="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1
 ${lsrc}ex_output.c:17:F:Core:test_fail:0: Failure
-${lsrc}ex_output.c:21:E:Core:test_exit:0: (after this point) Early exit with return value 1"
+${lsrc}ex_output.c:26:E:Core:test_exit:0: (after this point) Early exit with return value 1"
 t3="xRunning suite(s): Master
 33%: Checks: 3, Failures: 1, Errors: 1
 ${lsrc}ex_output.c:11:P:Core:test_pass:0: Passed
 ${lsrc}ex_output.c:17:F:Core:test_fail:0: Failure
-${lsrc}ex_output.c:21:E:Core:test_exit:0: (after this point) Early exit with return value 1"
+${lsrc}ex_output.c:26:E:Core:test_exit:0: (after this point) Early exit with return value 1"
 t4="xtest: Core:test_pass
 success: Core:test_pass
 test: Core:test_fail
@@ -28,7 +28,7 @@ ${lsrc}ex_output.c:17: Failure
 ]
 test: Core:test_exit
 error: Core:test_exit [
-${lsrc}ex_output.c:21: (after this point) Early exit with return value 1
+${lsrc}ex_output.c:26: (after this point) Early exit with return value 1
 ]"
 
 op0=`./ex_output${EXEEXT} CK_SILENT`