From b19ad7281eb0323a38bb2d0e2de3554caf88d3f8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 22 Aug 2005 23:35:01 +0000 Subject: r9493: our test scripts need to use testok at the end or the errors don't annumulate between scripts this is why the GetOptions bug wasn't caught by 'make test' (This used to be commit 20a14b9b35c928a592cf03ebedbc6c89f756af28) --- source4/script/tests/test_ejs.sh | 2 ++ source4/script/tests/test_ldap.sh | 2 ++ source4/script/tests/test_nbt.sh | 2 ++ source4/script/tests/test_quick.sh | 2 +- source4/script/tests/test_session_key.sh | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) (limited to 'source4/script/tests') diff --git a/source4/script/tests/test_ejs.sh b/source4/script/tests/test_ejs.sh index bec130dc86..2f1a2abcad 100755 --- a/source4/script/tests/test_ejs.sh +++ b/source4/script/tests/test_ejs.sh @@ -25,3 +25,5 @@ for f in samr.js echo.js ldb.js; do done testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD || failed=`expr $failed + 1` + +testok $0 $failed diff --git a/source4/script/tests/test_ldap.sh b/source4/script/tests/test_ldap.sh index a457f527bd..746ca4672b 100755 --- a/source4/script/tests/test_ldap.sh +++ b/source4/script/tests/test_ldap.sh @@ -55,3 +55,5 @@ testit "ldb tests" $LDBDIR/tests/test-tdb.sh SCRIPTDIR=../testprogs/ejs testit "ejs ldap test" $SCRIPTDIR/ldap.js $SERVER -U$USERNAME%$PASSWORD || failed=`expr $failed + 1` + +testok $0 $failed diff --git a/source4/script/tests/test_nbt.sh b/source4/script/tests/test_nbt.sh index 23a04cf413..f31d271c1e 100755 --- a/source4/script/tests/test_nbt.sh +++ b/source4/script/tests/test_nbt.sh @@ -21,3 +21,5 @@ export PATH for f in NBT-REGISTER NBT-WINS; do testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1` done + +testok $0 $failed diff --git a/source4/script/tests/test_quick.sh b/source4/script/tests/test_quick.sh index 2879d54b59..6c8e77a151 100755 --- a/source4/script/tests/test_quick.sh +++ b/source4/script/tests/test_quick.sh @@ -36,4 +36,4 @@ for t in $tests; do done testok $0 $failed -sleep 10000 + diff --git a/source4/script/tests/test_session_key.sh b/source4/script/tests/test_session_key.sh index 8296bc3956..ea23cab9d3 100755 --- a/source4/script/tests/test_session_key.sh +++ b/source4/script/tests/test_session_key.sh @@ -35,4 +35,5 @@ transport="ncacn_np" name="RPC-SECRETS on $transport with $ntlmoptions" testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-SECRETS "$*" || failed=`expr $failed + 1` done + testok $0 $failed -- cgit