r9493: our test scripts need to use testok at the end or the errors don't annumulate...

this is why the GetOptions bug wasn't caught by 'make test'

diff --git a/source/script/tests/test_ejs.sh b/source/script/tests/test_ejs.sh
index bec130dc869a6e36e4f5659d79130851dc546858..2f1a2abcad8d7aebdca306caf3e9e1c18af9ebdd 100755 (executable)
--- a/source/script/tests/test_ejs.sh
+++ b/source/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/source/script/tests/test_ldap.sh b/source/script/tests/test_ldap.sh
index a457f527bd1bf3d8f6d00b86496fca3e50807fba..746ca4672b371aba114cf651ef890aff3f444ba4 100755 (executable)
--- a/source/script/tests/test_ldap.sh
+++ b/source/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/source/script/tests/test_nbt.sh b/source/script/tests/test_nbt.sh
index 23a04cf4136d9f9773910d718e4b8fd2d1cbda24..f31d271c1eddfe7e42b2ee42cb844e5efc89a5fe 100755 (executable)
--- a/source/script/tests/test_nbt.sh
+++ b/source/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/source/script/tests/test_quick.sh b/source/script/tests/test_quick.sh
index 2879d54b59dac67c0278defaf4add7da1a1b3158..6c8e77a151f214c2148d48f7893ad6f4da5afc81 100755 (executable)
--- a/source/script/tests/test_quick.sh
+++ b/source/script/tests/test_quick.sh
@@ -36,4 +36,4 @@ for t in $tests; do
 done
 
 testok $0 $failed
-sleep 10000
+

diff --git a/source/script/tests/test_session_key.sh b/source/script/tests/test_session_key.sh
index 8296bc395604a8975ec3e858ff05a6751addfe9c..ea23cab9d38c841b22abdd41956750f94596c047 100755 (executable)
--- a/source/script/tests/test_session_key.sh
+++ b/source/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