Fix the "forward" system test on Windows

Make the "forward" system test work on Windows again by fixing a
backporting glitch in commit 544ea4122427f7aa06ece33e13156d6b47ce8615.

diff --git a/bin/tests/system/forward/ns1/sign.sh b/bin/tests/system/forward/ns1/sign.sh
index 1a2d732018b00062607590dab49bf4c86f2bb45f..84931c2d34350d6de2f73ddd6fccca5ad3081838 100644 (file)
--- a/bin/tests/system/forward/ns1/sign.sh
+++ b/bin/tests/system/forward/ns1/sign.sh
@@ -10,7 +10,7 @@
 # information regarding copyright ownership.
 
 # shellcheck source=conf.sh
-. ../../conf.sh
+. "$SYSTEMTESTTOP/conf.sh"
 
 set -e
 

diff --git a/bin/tests/system/forward/setup.sh b/bin/tests/system/forward/setup.sh
index c3a1bf4d656c080295f38d151761f97ad1fcafb4..7e81b9c5bea64b3c619c60b9c6219d4984880abc 100644 (file)
--- a/bin/tests/system/forward/setup.sh
+++ b/bin/tests/system/forward/setup.sh
@@ -9,8 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
-SYSTEMTESTTOP=..
-. $SYSTEMTESTTOP/conf.sh
+. "$SYSTEMTESTTOP/conf.sh"
 
 $SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf