X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=inline;f=tests%2Flib.sh;h=3427b5608fc36cdf7dca0824fbca4b4f97979f73;hb=34b3b931362c8d0fce96e390bb8b1ea94d6a4101;hp=94807699c8f305c2bd207031986257beeffa7c5d;hpb=fb9548453fbc0dedc8f145e8468fc601de784c32;p=coloredstderr%2Fcoloredstderr.git
diff --git a/tests/lib.sh b/tests/lib.sh
index 9480769..3427b56 100644
--- a/tests/lib.sh
+++ b/tests/lib.sh
@@ -15,17 +15,34 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
+set -e
+
# Allow running the script directly without running `make check`.
test "x$builddir" = x && builddir=.
test "x$EGREP" = x && EGREP='grep -E'
-# In case we are called with LD_PRELOAD already set.
-unset LD_PRELOAD
+# 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
+
+# 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
+
# Clean locale for reproducible tests.
LC_ALL=C
unset LANGUAGE
+# Set default COLORED_STDERR_FDS value.
+fds=2,
+
die() {
echo "$@" >&2
@@ -56,36 +73,61 @@ run_test() {
shift
shift
+ output="output-$$"
+
(
# Standard setup.
LD_PRELOAD="$library"
- COLORED_STDERR_FDS=2,
+ COLORED_STDERR_FDS="$fds"
export LD_PRELOAD
export COLORED_STDERR_FDS
# Change pre/post strings for simpler testing.
- COLORED_STDERR_PRE='>stderr>'
- COLORED_STDERR_POST=' output 2>&1
+ $valgrind_cmd "$@" "$testcase" > "$output" 2>&1
)
- diff -u "$expected" output \
+ diff -u "$expected" "$output" \
|| die 'failed!'
- rm output
+ rm "$output"
echo 'passed.'
}
test_script() {
- run_test "$srcdir/$1" "$srcdir/$1.expected"
+ testcase="$1"
+ expected="$2"
+ # shift || true is not enough for dash.
+ test $# -ge 2 && shift
+ shift
+
+ if test -z "$expected"; then
+ expected="$testcase"
+ fi
+ run_test "$srcdir/$testcase" "$srcdir/$expected.expected" "$@"
+}
+test_script_subshell() {
+ test_script "$1" "$2" bash -c 'bash $1' ''
}
test_program() {
- run_test "$builddir/$1" "$srcdir/$1.expected"
+ testcase="$1"
+ expected="$2"
+ test $# -ge 2 && shift
+ shift
+
+ if test -z "$expected"; then
+ expected="$testcase"
+ fi
+ run_test "$builddir/$testcase" "$srcdir/$expected.expected" "$@"
+}
+test_program_subshell() {
+ test_program "$1" "$2" sh -c '$1' ''
}