summaryrefslogtreecommitdiff
path: root/source4/script/tests/selftest.sh
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-01-15 23:42:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:43:36 -0500
commit6688846ee1613392c2dc6b11e33732adc656b362 (patch)
tree1df6a41399e686c3299db44561d74681b4d020f3 /source4/script/tests/selftest.sh
parent0ce02a2c0eb322502bd931e83fa23ce476198e06 (diff)
downloadsamba-6688846ee1613392c2dc6b11e33732adc656b362.tar.gz
samba-6688846ee1613392c2dc6b11e33732adc656b362.tar.bz2
samba-6688846ee1613392c2dc6b11e33732adc656b362.zip
r20822: Fix total failure counting.
(This used to be commit e4691447c47d6e8c938fee934e7a9aba2f418858)
Diffstat (limited to 'source4/script/tests/selftest.sh')
-rwxr-xr-xsource4/script/tests/selftest.sh16
1 files changed, 7 insertions, 9 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh
index 788e4e48fa..885486d546 100755
--- a/source4/script/tests/selftest.sh
+++ b/source4/script/tests/selftest.sh
@@ -219,8 +219,6 @@ START=`date`
bin/nmblookup $CONFIGURATION -U $SERVER $NETBIOSNAME
# start off with 0 failures
-failed=0
-export failed
totalfailed=0
export totalfailed
@@ -238,12 +236,12 @@ cat $PREFIX/recipe | (
else
echo "$LINE"
fi
- done
- )
-
- exit $totalfailed
+ done
+ exit $totalfailed
+)
+exit $?
) 9>$SMBD_TEST_FIFO
-failed=$?
+totalfailed=$?
kill `cat $PIDDIR/smbd.pid`
@@ -261,10 +259,10 @@ if [ "$count" != 0 ]; then
for f in $PREFIX/valgrind.log*; do
if [ -s $f ] && grep -v DWARF2.CFI.reader $f > /dev/null; then
echo "VALGRIND FAILURE";
- failed=`expr $failed + 1`
+ totalfailed=`expr $totalfailed + 1`
cat $f
fi
done
fi
-teststatus $ARG0 $failed
+teststatus $ARG0 $totalfailed