X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=tests%2Flib.sh;h=3e29a55023816cc539065c20c1b8ce898b00b7db;hb=9af3c2c72729536f5822c78572510b251895eb70;hp=94807699c8f305c2bd207031986257beeffa7c5d;hpb=fb9548453fbc0dedc8f145e8468fc601de784c32;p=coloredstderr%2Fcoloredstderr.git

diff --git a/tests/lib.sh b/tests/lib.sh
index 9480769..3e29a55 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -64,8 +64,8 @@ run_test() {
         export COLORED_STDERR_FDS
 
         # Change pre/post strings for simpler testing.
-        COLORED_STDERR_PRE='>stderr>'
-        COLORED_STDERR_POST='<stderr<'
+        COLORED_STDERR_PRE='>STDERR>'
+        COLORED_STDERR_POST='<STDERR<'
         export COLORED_STDERR_PRE
         export COLORED_STDERR_POST
         # And force writes to a file (unless we are testing the force).
@@ -74,7 +74,7 @@ run_test() {
             export COLORED_STDERR_FORCE_WRITE
         fi
 
-        "$testcase" > output 2>&1
+        $valgrind_cmd "$@" "$testcase" > output 2>&1
     )
 
     diff -u "$expected" output \
@@ -84,8 +84,18 @@ run_test() {
 }
 
 test_script() {
-    run_test "$srcdir/$1" "$srcdir/$1.expected"
+    testcase="$1"
+    shift
+    run_test "$srcdir/$testcase" "$srcdir/$testcase.expected" "$@"
+}
+test_script_subshell() {
+    test_script "$1" bash -c 'bash $1' ''
 }
 test_program() {
-    run_test "$builddir/$1" "$srcdir/$1.expected"
+    testcase="$1"
+    shift
+    run_test "$builddir/$testcase" "$srcdir/$testcase.expected" "$@"
+}
+test_program_subshell() {
+    test_program "$1" sh -c '$1' ''
 }