A small convenience for testing the support tools. --- bin/tests/system/run.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh index 150f3b5..61563df 100644 --- a/bin/tests/system/run.sh +++ b/bin/tests/system/run.sh @@ -32,6 +32,11 @@ echo "S:$test:`date`" >&2 echo "T:$test:1:A" >&2 echo "A:System test $test" >&2 +nosocks=true +for d in $test/ns[0-9]* $test/lwresd[0-9]* $test/ans[0-9]* +do test -d $d && nosocks=false +done + if [ x${PERL:+set} = x ] then echo "I:Perl not available. Skipping test." >&2 @@ -40,7 +45,7 @@ then exit 0; fi -$PERL testsock.pl || { +$nosocks || $PERL testsock.pl || { echo "I:Network interface aliases not set up. Skipping test." >&2; echo "R:UNTESTED" >&2; echo "E:$test:`date`" >&2; @@ -80,7 +85,11 @@ then fi # Start name servers running -$PERL start.pl $test || { echo "R:FAIL"; echo "E:$test:`date`"; exit 1; } +$nosocks || $PERL start.pl $test || { + echo "R:FAIL"; + echo "E:$test:`date`"; + exit 1; +} # Run the tests ( cd $test ; $SHELL tests.sh ) -- 2.10.1.445.g3cdd5d1