From: Stephen Morris <stephen@isc.org>
Date: Fri, 15 Dec 2017 19:30:55 +0000 (+0000)
Subject: [rt46602] Check prerequsities before network interfaces when running test.
X-Git-Tag: v9.13.0~158^2~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=549a6c6bc8e451ecf15f4b98df588596117c9202;p=thirdparty%2Fbind9.git

[rt46602] Check prerequsities before network interfaces when running test.
---

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 5b1ef95776c..2f8f1ee5ac5 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -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