]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Fix the status_file in custom-test-driver in non-verbose runs
authorOndřej Surý <ondrej@isc.org>
Wed, 6 May 2020 12:47:02 +0000 (14:47 +0200)
committerOndřej Surý <ondrej@isc.org>
Thu, 7 May 2020 14:31:58 +0000 (16:31 +0200)
custom-test-driver

index e11acd5685a712444f807df3961d31345028f425..e880016580430e4e93ee08d521cf5f7596d567f1 100755 (executable)
@@ -1,7 +1,7 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2020-04-24.14; # UTC
+scriptversion=2020-05-06.12; # UTC
 
 # Copyright (C) 2011-2020 Free Software Foundation, Inc.
 #
@@ -65,6 +65,7 @@ while test $# -gt 0; do
   --test-name) test_name=$2; shift;;
   --log-file) log_file=$2; shift;;
   --trs-file) trs_file=$2; shift;;
+  --status-file) status_file=$2; shift;;
   --color-tests) color_tests=$2; shift;;
   --expect-failure) expect_failure=$2; shift;;
   --enable-hard-errors) enable_hard_errors=$2; shift;;
@@ -106,9 +107,10 @@ trap "st=130; $do_exit" 2
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
+# Set default
+test x"$status_file" = x && status_file=$(mktemp ./custom-test-runner.XXXXXX)
 # Test script is run here.
 if test $verbose = yes; then
-  status_file=$(mktemp)
   ("$@" 2>&1; echo $? > "$status_file") | tee $log_file
 else
   "$@" >$log_file 2>&1; echo $? > "$status_file"