X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Frun.sh;h=a203d48235f1c418315d48fdbe5ff5544c4dfd2a;hb=05aefe25bacd1c22bf2d5cc935aa9d3d28f5d841;hp=186b24bfae60ba9e4b70a97d8ff12882c20ac6e9;hpb=5c8b5233fbadc8963cef28d851599bf4c34d271a;p=coloredstderr%2Fcoloredstderr.git

diff --git a/tests/run.sh b/tests/run.sh
index 186b24b..a203d48 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -21,6 +21,14 @@
 set -e
 
 
+# The tests fail if running under coloredstderr because the tests redirect
+# stderr to stdout which is detected by coloredstderr :D (and not colored as a
+# result). Therefore remove LD_PRELOAD and re-exec the test.
+if test -n "$LD_PRELOAD"; then
+    unset LD_PRELOAD
+    exec "$0"
+fi
+
 test "x$srcdir" = x && srcdir=.
 . "$srcdir/lib.sh"
 
@@ -34,21 +42,21 @@ fi
 
 # Make sure we don't write to non-ttys by default.
 force_write=
-test_script example-noforce.sh
+test_script example_noforce.sh
 force_write=1
 
-test_script example-simple.sh
-test_script example-redirects.sh
+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_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.