Commit 6a830d51 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

Also track skipped (non-executable) tests

parent a4d7b652
...@@ -22,6 +22,7 @@ if test -t 1 ; then ...@@ -22,6 +22,7 @@ if test -t 1 ; then
fi fi
FAILCOUNT=0 FAILCOUNT=0
SKIPCOUNT=0
SLEEPTIME=10 SLEEPTIME=10
echo ">>>>> Executing all LDAP tests for $BACKEND" echo ">>>>> Executing all LDAP tests for $BACKEND"
...@@ -56,24 +57,32 @@ for CMD in $SRCDIR/scripts/test*; do ...@@ -56,24 +57,32 @@ for CMD in $SRCDIR/scripts/test*; do
EOF EOF
fi fi
echo ">>>>> Starting ${TB}`basename $CMD`${TN} for $BACKEND..." if [ -x "$CMD" ]; then
$CMD BCMD=`basename $CMD`
RC=$? echo ">>>>> Starting ${TB}$BCMD${TN} for $BACKEND..."
if test $RC -eq 0 ; then $CMD
echo ">>>>> $CMD completed ${TB}OK${TN} for $BACKEND." RC=$?
else if test $RC -eq 0 ; then
echo ">>>>> $CMD ${TB}failed${TN} for $BACKEND" echo ">>>>> $BCMD completed ${TB}OK${TN} for $BACKEND."
FAILCOUNT=`expr $FAILCOUNT + 1`
if [ -n "$NOEXIT" ]; then
echo "Continuing..."
else else
echo "(exit $RC)" echo ">>>>> $BCMD ${TB}failed${TN} for $BACKEND"
exit $RC FAILCOUNT=`expr $FAILCOUNT + 1`
if [ -n "$NOEXIT" ]; then
echo "Continuing."
else
echo "(exit $RC)"
exit $RC
fi
fi fi
else
echo ">>>>> Skipping ${TB}$BCMD${TN} for $BACKEND."
SKIPCOUNT=`expr $SKIPCOUNT + 1`
RC="-"
fi fi
if [ -n "$NOEXIT" ]; then if [ -n "$NOEXIT" ]; then
echo "$RC $CMD" >> $TESTWD/results echo "$RC $BCMD" >> $TESTWD/results
fi fi
# echo ">>>>> waiting $SLEEPTIME seconds for things to exit" # echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
...@@ -84,9 +93,10 @@ done ...@@ -84,9 +93,10 @@ done
if [ -n "$NOEXIT" ]; then if [ -n "$NOEXIT" ]; then
if [ "$FAILCOUNT" -gt 0 ]; then if [ "$FAILCOUNT" -gt 0 ]; then
cat $TESTWD/results cat $TESTWD/results
echo "$FAILCOUNT tests failed. Please review the test log." echo "$FAILCOUNT tests for $BACKEND ${TB}failed${TN}. Please review the test log."
exit $FAILCOUNT
else else
echo "All tests succeeded." echo "All executed tests for $BACKEND ${TB}succeeded${TN}."
fi fi
fi fi
echo "$SKIPCOUNT tests for $BACKEND were ${TB}skipped${TN}."
Supports Markdown
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