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/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh
index c031b20a6211b87f4d247639975ab0f7732732e5..7f6ab34842773bb6c003f9e2574a69ca1f6fbaab 100644 (file)
--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 # shellcheck source=conf.sh
+SYSTEMTESTTOP=..
 . "$SYSTEMTESTTOP/conf.sh"
 
 set -e

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 2a70b7c1b6990b72d3ab49e7a8cce2a19a9a3606..3d2ccec4209c57c9c90aff8cd4857decffd76d7a 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 # shellcheck source=conf.sh
+SYSTEMTESTTOP=..
 . "$SYSTEMTESTTOP/conf.sh"
 
 set -e

diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
index 175077be31dbe81c9962869e8d762276dffc3077..0f74b1740894df0571906da0a3ebc7f2be318db6 100755 (executable)
--- a/bin/tests/system/masterformat/tests.sh
+++ b/bin/tests/system/masterformat/tests.sh
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 # shellcheck source=conf.sh
+SYSTEMTESTTOP=..
 . "$SYSTEMTESTTOP/conf.sh"
 
 status=0

diff --git a/bin/tests/system/sfcache/tests.sh b/bin/tests/system/sfcache/tests.sh
index 43922e4e83670bfa4651357cca8b9d727c32238e..40c9f86347186847ce69e2dc3cf25017f0b2b1b6 100644 (file)
--- a/bin/tests/system/sfcache/tests.sh
+++ b/bin/tests/system/sfcache/tests.sh
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 # shellcheck source=conf.sh
+SYSTEMTESTTOP=..
 . "$SYSTEMTESTTOP/conf.sh"
 
 set -e

diff --git a/bin/tests/system/synthfromdnssec/tests.sh b/bin/tests/system/synthfromdnssec/tests.sh
index 8fc5d0a27b22c4a0036520c57f4cdb7489c0f195..1fa233f148119b475c23b4cc30555dd9cafac5ea 100644 (file)
--- a/bin/tests/system/synthfromdnssec/tests.sh
+++ b/bin/tests/system/synthfromdnssec/tests.sh
@@ -10,6 +10,7 @@
 # information regarding copyright ownership.
 
 # shellcheck source=conf.sh
+SYSTEMTESTTOP=..
 . "$SYSTEMTESTTOP/conf.sh"
 
 set -e

diff --git a/bin/tests/system/ttl/clean.sh b/bin/tests/system/ttl/clean.sh
index 0f928d68631c27348aa0423483d0bece1510863d..70b2dca3d8b99df79def0cd45e3dcba7dd8fab77 100644 (file)
--- a/bin/tests/system/ttl/clean.sh
+++ b/bin/tests/system/ttl/clean.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../conf.sh
+. $SYSTEMTESTTOP/conf.sh
 
 rm -f ./dig.out.*
 rm -f ./*/named.conf

diff --git a/bin/tests/system/ttl/setup.sh b/bin/tests/system/ttl/setup.sh
index 68fd0d2b81440c1f69e3f2a16c8eff946755a425..7c905f6b5ed592bf4d60e86ff12d33bc0886420c 100644 (file)
--- a/bin/tests/system/ttl/setup.sh
+++ b/bin/tests/system/ttl/setup.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../conf.sh
+. $SYSTEMTESTTOP/conf.sh
 
 $SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/ttl/tests.sh b/bin/tests/system/ttl/tests.sh
index e0a3582b7f59b460b2e6a15cb5aca856786bfe24..54ca973f1d17620c3db12acafb7e63be185783c4 100644 (file)
--- a/bin/tests/system/ttl/tests.sh
+++ b/bin/tests/system/ttl/tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. ../conf.sh
+. $SYSTEMTESTTOP/conf.sh
 
 dig_with_options() { "$DIG" +noadd +nosea +nostat +noquest +nocomm +nocmd -p "${PORT}" "$@"; }