ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

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

Browse Source 
(cherry picked from commit 549a6c6bc8)
This commit is contained in:
Stephen Morris
2017-12-15 19:30:55 +00:00
parent d737040fcf
commit 4dc368a837
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/tests/system/run.sh
View 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