mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-04 08:35:31 +00:00
Code Issues Releases Wiki Activity

When a prereq.sh file determines that a test can't run because the feature

Browse Source 
to be tested was not configured in at build time, it can now return 255,
and run.sh will print "R:SKIPPED" instead of "R:UNTESTED".  Robie will be
able to flag this as green rather than yellow.
This commit is contained in:
Evan Hunt
2010-12-20 21:35:45 +00:00
parent d39a94a1db
commit 950aa1d752
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/dlzexternal/prereq.sh
View File

@@ -5,7 +5,7 @@ TOP=${SYSTEMTESTTOP:=.}/../../../..
# enable the dlzexternal test only if it builds and dlz-dlopen was enabled # enable the dlzexternal test only if it builds and dlz-dlopen was enabled
$TOP/bin/named/named -V | grep with.dlz.dlopen | grep -v with.dlz.dlopen=no > /dev/null || { $TOP/bin/named/named -V | grep with.dlz.dlopen | grep -v with.dlz.dlopen=no > /dev/null || {
echo "I:not built with --with-dlz-dlopen=yes - skipping dlzexternal test" echo "I:not built with --with-dlz-dlopen=yes - skipping dlzexternal test"
exit 1 exit 255
} }
cd ../../../../contrib/dlz/example && make all > /dev/null || { cd ../../../../contrib/dlz/example && make all > /dev/null || {

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

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
# $Id: run.sh,v 1.44 2010/06/08 23:50:24 tbox Exp $ # $Id: run.sh,v 1.45 2010/12/20 21:35:45 each Exp $
# #
# Run a system test. # Run a system test.
@@ -58,14 +58,14 @@ $PERL testsock.pl || {
# Check for test-specific prerequisites. # Check for test-specific prerequisites.
if test ! -f $test/prereq.sh || ( cd $test && sh prereq.sh "$@" )
test ! -f $test/prereq.sh || result=$?
( cd $test && sh prereq.sh "$@" )
then if [ $result -eq 0 ]; then
: prereqs ok : prereqs ok
else else
echo "I:Prerequisites for $test missing, skipping test." >&2 echo "I:Prerequisites for $test missing, skipping test." >&2
echo "R:UNTESTED" >&2 [ $result -eq 255 ] && echo "R:SKIPPED" || echo "R:UNTESTED"
echo "E:$test:`date`" >&2 echo "E:$test:`date`" >&2
exit 0 exit 0
fi fi

2
bin/tests/system/tsiggss/prereq.sh
View File

@@ -5,7 +5,7 @@ TOP=${SYSTEMTESTTOP:=.}/../../../..
# enable the tsiggss test only if gssapi was enabled # enable the tsiggss test only if gssapi was enabled
$TOP/bin/named/named -V | grep with.gssapi | grep -v with-gssapi=no > /dev/null || { $TOP/bin/named/named -V | grep with.gssapi | grep -v with-gssapi=no > /dev/null || {
echo "I:BIND9 was not built with --with-gssapi" echo "I:BIND9 was not built with --with-gssapi"
exit 1 exit 255
} }
exit 0 exit 0