]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
[rt46602] Check prerequsities before network interfaces when running test.
authorStephen Morris <stephen@isc.org>
Fri, 15 Dec 2017 19:30:55 +0000 (19:30 +0000)
committerStephen Morris <stephen@isc.org>
Fri, 16 Feb 2018 15:19:44 +0000 (15:19 +0000)
bin/tests/system/run.sh

index 5b1ef95776cb50940fdcfd66da1327f27438524a..2f8f1ee5ac505381f6a5e54d97b1d28a49099c27 100644 (file)
@@ -92,6 +92,13 @@ then
     exit 0;
 fi
 
+$PERL testsock.pl -p $PORT  || {
+    echowarn "I:$test:Network interface aliases not set up.  Skipping test."
+    echowarn "R:$test:UNTESTED"
+    echoend  "E:$test:`date $dateargs`"
+    exit 0;
+}
+
 # Check for test-specific prerequisites.
 test ! -f $test/prereq.sh || ( cd $test && $SHELL prereq.sh "$@" )
 result=$?
@@ -105,14 +112,6 @@ else
     exit 0
 fi
 
-# Test sockets after the prerequisites has been setup
-$PERL testsock.pl -p $PORT  || {
-    echowarn "I:$test:Network interface aliases not set up.  Skipping test."
-    echowarn "R:$test:UNTESTED"
-    echoend  "E:$test:`date $dateargs`"
-    exit 0;
-}
-
 # Check for PKCS#11 support
 if
     test ! -f $test/usepkcs11 || $SHELL cleanpkcs11.sh