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.
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

View File

@@ -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