mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

[rt46602] Prefix R:<result> as R:<test>:<result>

Browse Source 
Resolve conflict in run.sh during cherry-pick from experimental branch.
This commit is contained in:
Ondřej Surý
2017-10-18 14:20:48 +02:00
committed by Stephen Morris
parent f7ac41757a
commit 278c72fef6
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
bin/tests/system/run.sh
View File

@@ -57,7 +57,7 @@ echoinfo "A:System test $test" >&2
if [ x${PERL:+set} = x ] if [ x${PERL:+set} = x ]
then then
echowarn "I:Perl not available. Skipping test." >&2 echowarn "I:Perl not available. Skipping test." >&2
echowarn "R:UNTESTED" >&2 echowarn "R:$test:UNTESTED" >&2
echoinfo "E:$test:`date $dateargs`" >&2 echoinfo "E:$test:`date $dateargs`" >&2
exit 0; exit 0;
fi fi
@@ -70,7 +70,7 @@ if [ $result -eq 0 ]; then
: prereqs ok : prereqs ok
else else
echowarn "I:Prerequisites for $test missing, skipping test." >&2 echowarn "I:Prerequisites for $test missing, skipping test." >&2
[ $result -eq 255 ] && echowarn "R:SKIPPED" || echowarn "R:UNTESTED" [ $result -eq 255 ] && echowarn "R:$test:SKIPPED" || echowarn "R:$test:UNTESTED"
echoinfo "E:$test:`date $dateargs`" >&2 echoinfo "E:$test:`date $dateargs`" >&2
exit 0 exit 0
fi fi
@@ -78,7 +78,7 @@ fi
# Test sockets after the prerequisites has been setup # Test sockets after the prerequisites has been setup
$PERL testsock.pl -p "${port}" || { $PERL testsock.pl -p "${port}" || {
echowarn "I:Network interface aliases not set up. Skipping test." >&2; echowarn "I:Network interface aliases not set up. Skipping test." >&2;
echowarn "R:UNTESTED" >&2; echowarn "R:$test:UNTESTED" >&2;
echoinfo "E:$test:`date $dateargs`" >&2; echoinfo "E:$test:`date $dateargs`" >&2;
exit 0; exit 0;
} }
@@ -90,7 +90,7 @@ then
: pkcs11 ok : pkcs11 ok
else else
echowarn "I:Need PKCS#11 for $test, skipping test." >&2 echowarn "I:Need PKCS#11 for $test, skipping test." >&2
echowarn "R:PKCS11ONLY" >&2 echowarn "R:$test:PKCS11ONLY" >&2
echoinfo "E:$test:`date $dateargs`" >&2 echoinfo "E:$test:`date $dateargs`" >&2
exit 0 exit 0
fi fi
@@ -102,7 +102,7 @@ then
fi fi
# Start name servers running # Start name servers running
$PERL start.pl -p $port $test || { echofail "R:FAIL"; echoinfo "E:$test:`date $dateargs`"; exit 1; } $PERL start.pl -p $port $test || { echofail "R:$test:$FAIL"; echoinfo "E:$test:`date $dateargs`"; exit 1; }
# Run the tests # Run the tests
( cd $test ; $SHELL tests.sh -c "$controlport" -p "$port" "$@" ) ( cd $test ; $SHELL tests.sh -c "$controlport" -p "$port" "$@" )
@@ -122,12 +122,11 @@ $PERL stop.pl $test
status=`expr $status + $?` status=`expr $status + $?`
if [ $status != 0 ]; then if [ $status != 0 ]; then
echofail "R:FAIL" echofail "R:$test:$FAIL"
# Don't clean up - we need the evidence. # Don't clean up - we need the evidence.
find . -name core -exec chmod 0644 '{}' \; find . -name core -exec chmod 0644 '{}' \;
else else
echopass "R:PASS" echopass "R:$test:PASS"
if $clean if $clean
then then
rm -f $SYSTEMTESTTOP/random.data rm -f $SYSTEMTESTTOP/random.data

4
bin/tests/system/runall.sh
View File

@@ -33,7 +33,7 @@ EOF
} }
echo "I:System test result summary:" echo "I:System test result summary:"
grep '^R:' systests.output | sort | uniq -c | sed -e 's/^/I: /' -e 's/R://' grep '^R:' systests.output | sed -e 's/^/I: /' -e 's/R:[^:]*//' | sort | uniq -c
grep '^R:FAIL' systests.output > /dev/null && status=1 grep '^R:[^:]*:FAIL' systests.output > /dev/null && status=1
exit $status exit $status