From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 10 Jun 2013 13:16:21 +0000 (+0200)
Subject: Only run vfork() tests if it's available.
X-Git-Tag: 0.1~83
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=2f1aa1cdd321301db62e25280356bee9a2ac5dfa;p=coloredstderr%2Fcoloredstderr.git

Only run vfork() tests if it's available.
---

diff --git a/configure.ac b/configure.ac
index 3b007c5..e17afdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,6 +66,7 @@ AC_ARG_ENABLE([debug],
 
 dnl Used in tests/Makefile.am to build the test only if error() is available.
 AM_CONDITIONAL([HAVE_ERROR_H],[test "x$ac_cv_header_error_h" = xyes])
+AM_CONDITIONAL([HAVE_VFORK],[test "x$ac_cv_func_vfork_works" = xyes])
 
 AC_CONFIG_FILES([Makefile src/Makefile tests/Makefile])
 AC_OUTPUT
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bc3a9a9..f8b0f94 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,13 +1,16 @@
 TESTS = run.sh
-check_PROGRAMS = example example_exec example_vfork
+check_PROGRAMS = example example_exec
 example_SOURCES = example.c
 example_exec_SOURCES = example_exec.c
-example_vfork_SOURCES = example_vfork.c
 
 if HAVE_ERROR_H
     check_PROGRAMS += example_error
     example_error_SOURCES = example_error.c
 endif
+if HAVE_VFORK
+    check_PROGRAMS += example_vfork
+    example_vfork_SOURCES = example_vfork.c
+endif
 
 dist_check_SCRIPTS = run.sh lib.sh
 dist_check_DATA = example.expected \
diff --git a/tests/run.sh b/tests/run.sh
index 186b24b..b57122c 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -41,14 +41,14 @@ test_script example-simple.sh
 test_script example-redirects.sh
 test_program example
 test_program example_exec
-test_program example_vfork
+test -x "$builddir/example_vfork" && test_program example_vfork
 test -x "$builddir/example_error" && test_program example_error
 
 test_script_subshell example-simple.sh
 test_script_subshell example-redirects.sh
 test_program_subshell example
 test_program_subshell example_exec
-test_program_subshell example_vfork
+test -x "$builddir/example_vfork" && test_program_subshell example_vfork
 test -x "$builddir/example_error" && test_program_subshell example_error
 
 # Necessary in case the test -x evaluates to false.