set and use SYSTEMTESTTOP consistently

diff --git a/bin/tests/system/clean.sh b/bin/tests/system/clean.sh
index 2306ac6cd0446af47f618af9aea96a9d6c02705c..2af06fb82db72cfe22a8bede58605ca52bfcb313 100644 (file)
--- a/bin/tests/system/clean.sh
+++ b/bin/tests/system/clean.sh
@@ -13,9 +13,11 @@
 # Clean up after a specified system test.
 #
 
-SYSTEMTESTTOP=.
+SYSTEMTESTTOP="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
 . $SYSTEMTESTTOP/conf.sh
 
+export SYSTEMTESTTOP
+
 # See if the "-r" flag is present.  This will usually be set when all the tests
 # are run (e.g. from "runall.sh") and tells the script not to delete the
 # test.output file created by run.sh.  This is because the script running all

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index 6d2fbc7783c01bcf0e31257cd6abd5fe878dca45..9a5164198803ec97050ebbd3f90707214719f10c 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -9,8 +9,8 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-# shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
 
 status=0
 n=1