X-Git-Url: https://ruderich.org/simon/gitweb/?p=coloredstderr%2Fcoloredstderr.git;a=blobdiff_plain;f=tests%2Frun.sh;h=a203d48235f1c418315d48fdbe5ff5544c4dfd2a;hp=1dc800f17af8110376153abe7411884d32a44209;hb=05aefe25bacd1c22bf2d5cc935aa9d3d28f5d841;hpb=1c5441c26aa476ffb7ee2a83cea9d73817f83292

diff --git a/tests/run.sh b/tests/run.sh
index 1dc800f..a203d48 100755
--- a/tests/run.sh
+++ b/tests/run.sh
@@ -21,16 +21,43 @@
 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"
 
 
+# Use valgrind to run the tests if it's available.
+valgrind_cmd=
+if type valgrind >/dev/null 2>&1; then
+    valgrind_cmd='valgrind --quiet --error-exitcode=1'
+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_vfork
+test_program example_exec
+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 -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.
+true