diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh index 337ace9e34..38221c31c9 100644 --- a/bin/tests/system/run.sh +++ b/bin/tests/system/run.sh @@ -29,7 +29,7 @@ shift test -d $test || { echo "$0: $test: no such test" >&2; exit 1; } -test -f /var/run/system_test_ifsetup || { echo "Interfaces not set up." >&2 \ +test -f /var/run/system_test_ifsetup || { echo "I:Interfaces not set up. Not trying system tests." >&2 \ ; exit 1; } # Set up any dynamically generated test data diff --git a/bin/tests/system/start.sh b/bin/tests/system/start.sh index 3aaf058f18..43fa155e7f 100644 --- a/bin/tests/system/start.sh +++ b/bin/tests/system/start.sh @@ -42,8 +42,14 @@ do fi fi $NAMED -c named.conf -d 99 -g >named.run 2>&1 & + x=1 while test ! -f named.pid do + x=`expr $x + 1` + if [ $x = 5 ]; then + echo "I: Couldn't start servers!" + exit 1 + fi sleep 1 done )