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

(cherry picked from commit 549a6c6bc8e451ecf15f4b98df588596117c9202)
(cherry picked from commit 0afcdf658d503a47101053883b172226ce0dde0c)

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index eb75b0fc61cbc3169e7981d95a07d2ecc63e7d7f..265198e2c5e1d902d6d74e3beae8f576a7a58385 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -101,6 +101,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=$?
@@ -114,14 +121,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