From: Nicolas Williams <nico@cryptonector.com>
Date: Sun, 17 Jan 2016 18:23:05 +0000 (-0600)
Subject: Make it possible to run tests with set -x
X-Git-Tag: jq-1.6rc1~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c514368f98da1c9d1d59f6026061f81c22317eb7;p=jq

Make it possible to run tests with set -x

One can now run:

    make TRACE_TESTS=1 check

to get detailed output
---

diff --git a/tests/jqtest b/tests/jqtest
index 8df5f11..2420e03 100755
--- a/tests/jqtest
+++ b/tests/jqtest
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. "${0%/*}/setup"
+. "${0%/*}/setup" "$@"
 
 $VALGRIND $Q $JQ -L "$mods" --run-tests $JQTESTDIR/jq.test
diff --git a/tests/mantest b/tests/mantest
index 46aae40..c5acf92 100755
--- a/tests/mantest
+++ b/tests/mantest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${0%/*}/setup"
+. "${0%/*}/setup" "$@"
 
 # We set PAGER because there's a mantest for `env` that uses it.
 (cd $JQBASEDIR/docs && rake mantests) |
diff --git a/tests/onigtest b/tests/onigtest
index 55c26bd..f452193 100755
--- a/tests/onigtest
+++ b/tests/onigtest
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. "${0%/*}/setup"
+. "${0%/*}/setup" "$@"
 
 $VALGRIND $Q $JQ -L "$mods" --run-tests $JQTESTDIR/onig.test
diff --git a/tests/optionaltest b/tests/optionaltest
index b2444a4..1de0a49 100755
--- a/tests/optionaltest
+++ b/tests/optionaltest
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. "${0%/*}/setup"
+. "${0%/*}/setup" "$@"
 
 $VALGRIND $Q $JQ -L "$mods" --run-tests $JQTESTDIR/optional.test
diff --git a/tests/setup b/tests/setup
index d64ba29..94bcf1e 100755
--- a/tests/setup
+++ b/tests/setup
@@ -2,6 +2,10 @@
 
 # This is meant to be included by each test's shell script driver.
 
+if [ -n "$TRACE_TESTS" ]; then
+    set -x
+fi
+
 set -eu
 
 JQTESTDIR=$(cd "$(dirname "$0")" && pwd)
diff --git a/tests/shtest b/tests/shtest
index 89ae617..2614e90 100755
--- a/tests/shtest
+++ b/tests/shtest
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "${0%/*}/setup"
+. "${0%/*}/setup" "$@"
 
 PATH=$JQBASEDIR:$PATH $JQBASEDIR/tests/jq-f-test.sh > /dev/null