Commit 950aa1d7 authored by Evan Hunt's avatar Evan Hunt
Browse files

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

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.
parent d39a94a1
......@@ -5,7 +5,7 @@ TOP=${SYSTEMTESTTOP:=.}/../../../..
# 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 || {
echo "I:not built with --with-dlz-dlopen=yes - skipping dlzexternal test"
exit 1
exit 255
}
cd ../../../../contrib/dlz/example && make all > /dev/null || {
......
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# 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.
......@@ -58,14 +58,14 @@ $PERL testsock.pl || {
# Check for test-specific prerequisites.
if
test ! -f $test/prereq.sh ||
( cd $test && sh prereq.sh "$@" )
then
test ! -f $test/prereq.sh || ( cd $test && sh prereq.sh "$@" )
result=$?
if [ $result -eq 0 ]; then
: prereqs ok
else
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
exit 0
fi
......
......@@ -5,7 +5,7 @@ TOP=${SYSTEMTESTTOP:=.}/../../../..
# enable the tsiggss test only if gssapi was enabled
$TOP/bin/named/named -V | grep with.gssapi | grep -v with-gssapi=no > /dev/null || {
echo "I:BIND9 was not built with --with-gssapi"
exit 1
exit 255
}
exit 0
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment