Test script output names which test suite is failing

examples/check.sh

@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+TEST_SUITE_NAME="${TEST_SUITE_NAME:-$0}"
+
+cd $(dirname $0)
+
 JSONNET_BIN="${JSONNET_BIN:-../jsonnet}"
 
 source ../test_suite/tests.source
@@ -51,8 +55,8 @@ done
 deinit
 
 if [ "$FAILED" -eq 0 ] ; then
-    echo "All $EXECUTED examples executed correctly."
+    echo "$TEST_SUITE_NAME: All $EXECUTED tests executed correctly."
 else
-    echo "$FAILED / $EXECUTED tests failed."
+    echo "$TEST_SUITE_NAME: $FAILED / $EXECUTED tests failed."
     exit 1
 fi

examples/terraform/check.sh

@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+export TEST_SUITE_NAME="$0"
+
+cd "$(dirname $0)"
+
 export EXAMPLES_DIR="$PWD"
 
 cd .. && ./check.sh

test_suite/run_fmt_idempotence_tests.sh

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cd "$(dirname $0)"
+
 source "tests.source"
 
 # Enable next line to test the garbage collector
@@ -51,9 +53,9 @@ for TEST in *.jsonnet ../examples/*.jsonnet ../examples/terraform/*.jsonnet ../b
 done
 
 if [ $FAILED -eq 0 ] ; then
-    echo "All $EXECUTED test scripts pass."
+    echo "$0: All $EXECUTED test scripts pass."
 else
-    echo "FAILED: $FAILED / $EXECUTED"
+    echo "$0: FAILED: $FAILED / $EXECUTED"
     exit 1
 fi
 

test_suite/run_fmt_tests.sh

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cd "$(dirname $0)"
+
 source "tests.source"
 
 # Enable next line to test the garbage collector
@@ -45,9 +47,9 @@ for TEST in *.jsonnet ../examples/*.jsonnet ../examples/terraform/*.jsonnet ../b
 done
 
 if [ $FAILED -eq 0 ] ; then
-    echo "All $EXECUTED test scripts pass."
+    echo "$0: All $EXECUTED test scripts pass."
 else
-    echo "FAILED: $FAILED / $EXECUTED"
+    echo "$0: FAILED: $FAILED / $EXECUTED"
     exit 1
 fi
 

test_suite/run_tests.sh

@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+cd "$(dirname $0)"
+
 source "tests.source"
 
 # Enable next line to test the garbage collector
@@ -62,8 +64,8 @@ done
 deinit
 
 if [ $FAILED -eq 0 ] ; then
-    echo "All $EXECUTED test scripts pass."
+    echo "$0: All $EXECUTED test scripts pass."
 else
-    echo "FAILED: $FAILED / $EXECUTED"
+    echo "$0: FAILED: $FAILED / $EXECUTED"
     exit 1
 fi

tests.sh

@@ -2,18 +2,21 @@ set -e
 
 JSONNET_BIN="${JSONNET_BIN:-./jsonnet}"
 TEST_SNIPPET="std.assertEqual(({ x: 1, y: self.x } { x: 2 }).y, 2)"
+echo -n "snippet: "
 "$JSONNET_BIN" -e "${TEST_SNIPPET}" || FAIL=TRUE
 
 if [ -z "$DISABLE_LIB_TESTS" ]; then
+    echo -n 'libjsonnet_test_snippet: '
     LD_LIBRARY_PATH=. ./libjsonnet_test_snippet "${TEST_SNIPPET}" || FAIL=TRUE
+    echo -n 'libjsonnet_test_file: '
     LD_LIBRARY_PATH=. ./libjsonnet_test_file "test_suite/object.jsonnet" || FAIL=TRUE
 fi
-(cd examples ; ./check.sh) || FAIL=TRUE
-(cd examples/terraform ; ./check.sh) || FAIL=TRUE
-(cd test_suite ; ./run_tests.sh) || FAIL=TRUE
+examples/check.sh || FAIL=TRUE
+examples/terraform/check.sh || FAIL=TRUE
+test_suite/run_tests.sh || FAIL=TRUE
 if [ -z "$DISABLE_FMT_TESTS" ]; then
-    (cd test_suite ; ./run_fmt_tests.sh) || FAIL=TRUE
-    (cd test_suite ; ./run_fmt_idempotence_tests.sh) || FAIL=TRUE
+    test_suite/run_fmt_tests.sh || FAIL=TRUE
+    test_suite/run_fmt_idempotence_tests.sh || FAIL=TRUE
 fi
 if [ -n "$FAIL" ]; then
     echo "TESTS FAILED"