diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-06-09 09:48:43 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:53 -0500 |
| commit | 1d0117c5193fec7c5a02909e2700fb6101da380d (patch) | |
| tree | 9609216fdcac624434422afe87ad40f3d8dba195 | |
| parent | 35314f2427d82c819903087d04e3cd7915b32b36 (diff) | |
| download | samba-1d0117c5193fec7c5a02909e2700fb6101da380d.tar.gz samba-1d0117c5193fec7c5a02909e2700fb6101da380d.tar.bz2 samba-1d0117c5193fec7c5a02909e2700fb6101da380d.zip | |
r7434: - do local tests step by step for better build-farm output
- fix typo ADDARGS -> ADDARG
metze
(This used to be commit 38e5198b1121725b4f1c9b27ac2f97bee43607fe)
| -rwxr-xr-x | source4/script/tests/selftest.sh | 4 | ||||
| -rwxr-xr-x | source4/script/tests/test_local.sh | 25 |
2 files changed, 27 insertions, 2 deletions
diff --git a/source4/script/tests/selftest.sh b/source4/script/tests/selftest.sh index 69c4bb7f83..b3198e0f46 100755 --- a/source4/script/tests/selftest.sh +++ b/source4/script/tests/selftest.sh @@ -46,7 +46,7 @@ EOF ADDARG="-s $CONFFILE" if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then - ADDARGS="$ADDARGS --option=\"torture:progress=no\"" + ADDARG="$ADDARG --option=\"torture:progress=no\"" fi SMBD_TEST_FIFO="$PREFIX/smbd_test.fifo" @@ -70,7 +70,7 @@ START=`date` $SRCDIR/script/tests/test_binding_string.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || failed=`expr $failed + $?` $SRCDIR/script/tests/test_echo.sh localhost $USERNAME $PASSWORD $DOMAIN $ADDARG || failed=`expr $failed + $?` $SRCDIR/script/tests/test_posix.sh //localhost/tmp $USERNAME $PASSWORD "" $ADDARG || failed=`expr $failed + $?` - $SRCDIR/bin/smbtorture $ADDARG ncalrpc: LOCAL-* || failed=`expr $failed + 1` + $SRCDIR/script/tests/test_local.sh $ADDARG || failed=`expr $failed + $?` exit $failed ) 9>$SMBD_TEST_FIFO failed=$? diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh new file mode 100755 index 0000000000..259864c200 --- /dev/null +++ b/source4/script/tests/test_local.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +local_tests="LOCAL-NTLMSSP LOCAL-ICONV LOCAL-TALLOC LOCAL-MESSAGING LOCAL-IRPC LOCAL-BINDING LOCAL-IDTREE LOCAL-SOCKET" + +if [ $# -lt 0 ]; then +cat <<EOF +Usage: test_local.sh +EOF +exit 1; +fi + +if [ -z "$VALGRIND" ]; then + export MALLOC_CHECK_=2 +fi + +incdir=`dirname $0` +. $incdir/test_functions.sh + +failed=0 +for t in $local_tests; do + name="$t" + testit "$name" $VALGRIND bin/smbtorture ncalrpc: $t "$*" || failed=`expr $failed + 1` +done + +testok $0 $failed |