svn commit: samba r21029 - in branches/SAMBA_4_0: . source/script/tests

jelmer at samba.org jelmer at samba.org
Fri Jan 26 13:33:07 GMT 2007


Author: jelmer
Date: 2007-01-26 13:33:06 +0000 (Fri, 26 Jan 2007)
New Revision: 21029

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21029

Log:
- Remove now unused failure checking code
- Use --list option for smbtorture for local and nbt tests as well

Removed:
   branches/SAMBA_4_0/source/script/tests/tests_client.sh
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/test_binding_string.sh
   branches/SAMBA_4_0/source/script/tests/test_echo.sh
   branches/SAMBA_4_0/source/script/tests/test_ejs.sh
   branches/SAMBA_4_0/source/script/tests/test_ldap.sh
   branches/SAMBA_4_0/source/script/tests/test_local.sh
   branches/SAMBA_4_0/source/script/tests/test_nbt.sh
   branches/SAMBA_4_0/source/script/tests/test_net.sh
   branches/SAMBA_4_0/source/script/tests/test_pidl.sh
   branches/SAMBA_4_0/source/script/tests/test_posix.sh
   branches/SAMBA_4_0/source/script/tests/test_quick.sh
   branches/SAMBA_4_0/source/script/tests/test_rpc.sh
   branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh
   branches/SAMBA_4_0/source/script/tests/test_session_key.sh
   branches/SAMBA_4_0/source/script/tests/test_simple.sh
   branches/SAMBA_4_0/source/script/tests/test_swig.sh
   branches/SAMBA_4_0/source/script/tests/test_w2k3.sh
   branches/SAMBA_4_0/source/script/tests/test_w2k3_file.sh
   branches/SAMBA_4_0/source/script/tests/tests_net.sh


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
   - jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv

   + jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv
jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u


Modified: branches/SAMBA_4_0/source/script/tests/test_binding_string.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_binding_string.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_binding_string.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -28,7 +28,7 @@
 		 "308FB580-1EB2-11CA-923B-08002B1075A7 at ncacn_np:$server" \
 		 "308FB580-1EB2-11CA-923B-08002B1075A7 at ncacn_ip_tcp:$server" 
 do
-	testit "$I" bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:quick=yes RPC-ECHO "$*" || failed=`expr $failed + 1`
+	testit "$I" bin/smbtorture $TORTURE_OPTIONS "$I" -U"$username"%"$password" -W $domain --option=torture:quick=yes RPC-ECHO "$*"
 done
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_echo.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_echo.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_echo.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -30,7 +30,7 @@
   for ntlmoptions in \
         "--option=socket:testnonblock=True --option=torture:quick=yes"; do
    name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
-   testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
+   testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
   done
  done
 done
@@ -49,12 +49,12 @@
         "--option=clientntlmv2auth=yes  --option=ntlmssp_client:128bit=no --option=ntlmssp_client:keyexchange=no  --option=torture:quick=yes" \
     ; do
    name="RPC-ECHO on $transport with $bindoptions and $ntlmoptions"
-   testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
+   testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $ntlmoptions -U"$username"%"$password" -W $domain RPC-ECHO "$*"
   done
  done
 done
 
 name="RPC-ECHO on ncacn_np over smb2"
-testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[smb2]" -U"$username"%"$password" -W $domain RPC-ECHO "$*" || failed=`expr $failed + 1`
+testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server[smb2]" -U"$username"%"$password" -W $domain RPC-ECHO "$*"
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_ejs.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_ejs.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_ejs.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -21,18 +21,17 @@
 PATH=bin:$PATH
 export PATH
 
-testit "base.js" $SCRIPTDIR/base.js $CONFIGURATION || failed=`expr $failed + 1`
+testit "base.js" $SCRIPTDIR/base.js $CONFIGURATION
 
-for f in samr.js echo.js; do
-    testit "$f" $SCRIPTDIR/$f $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
-done
+testit "samr.js" "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
+testit "echo.js" "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD
 
-testit "ejsnet.js" $SCRIPTDIR/ejsnet.js $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser || failed=`expr $failed + 1`
+testit "ejsnet.js" $SCRIPTDIR/ejsnet.js $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser
 
-testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION || failed=`expr $failed + 1`
+testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION
 
-testit "samba3sam.js" $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/ || failed=`expr $failed + 1`
+testit "samba3sam.js" $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
 
-testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
+testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_ldap.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_ldap.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_ldap.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -30,18 +30,18 @@
  done
 done
 
-testit "CLDAP" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ LDAP-CLDAP || failed=`expr $failed + 1`
+testit "CLDAP" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ LDAP-CLDAP
 
 # only do the ldb tests when not in quick mode - they are quite slow, and ldb
 # is now pretty well tested by the rest of the quick tests anyway
 test "$TORTURE_QUICK" = "yes" || {
    LDBDIR=lib/ldb
    export LDBDIR
-   testit "ldb tests" $LDBDIR/tests/test-tdb.sh || failed=`expr $failed + 1`
+   testit "ldb tests" $LDBDIR/tests/test-tdb.sh
 }
 
 SCRIPTDIR=../testprogs/ejs
 
-testit "ejs ldap test" $SCRIPTDIR/ldap.js $CONFIGURATION $SERVER -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
+testit "ejs ldap test" $SCRIPTDIR/ldap.js $CONFIGURATION $SERVER -U$USERNAME%$PASSWORD 
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_local.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_local.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_local.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -1,14 +1,6 @@
 #!/bin/sh
 
-local_tests="LOCAL-REPLACE LOCAL-TALLOC LOCAL-STRLIST"
-local_tests="$local_tests LOCAL-IDTREE LOCAL-EVENT"
-local_tests="$local_tests LOCAL-SOCKET LOCAL-MESSAGING LOCAL-IRPC"
-local_tests="$local_tests LOCAL-NDR LOCAL-BINDING LOCAL-FILE LOCAL-REGISTRY"
-local_tests="$local_tests LOCAL-SDDL LOCAL-PAC LOCAL-DBSPEED LOCAL-TDR "
-local_tests="$local_tests LOCAL-NTLMSSP LOCAL-CRYPTO-MD4"
-local_tests="$local_tests LOCAL-CRYPTO-MD5 LOCAL-CRYPTO-HMACMD5"
-local_tests="$local_tests LOCAL-CRYPTO-SHA1 LOCAL-CRYPTO-HMACSHA1"
-local_tests="$local_tests LOCAL-RESOLVE LOCAL-TORTURE"
+local_tests=`bin/smbtorture --list | grep "^LOCAL-" | xargs`
 
 if [ `uname` = "Linux" ]; then
     # testing against the system iconv only makes sense for our 'reference' iconv
@@ -33,7 +25,7 @@
 failed=0
 for t in $local_tests; do
 	name="$t"
-	testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*" || failed=`expr $failed + 1`
+	testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS ncalrpc: $t "$*"
 done
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_nbt.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_nbt.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -18,8 +18,8 @@
 PATH=bin:$PATH
 export PATH
 
-testit "nmblookup -U $SERVER $SERVER" bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER || failed=`expr $failed + 1`
-testit "nmblookup $SERVER" bin/nmblookup $TORTURE_OPTIONS $SERVER || failed=`expr $failed + 1`
+testit "nmblookup -U $SERVER $SERVER" bin/nmblookup $TORTURE_OPTIONS -U $SERVER $SERVER
+testit "nmblookup $SERVER" bin/nmblookup $TORTURE_OPTIONS $SERVER
 
 NBT_TESTS="NBT-REGISTER NBT-WINS"
 NBT_TESTS="$NBT_TESTS NBT-WINSREPLICATION"
@@ -29,7 +29,7 @@
 NBT_TESTS="$NBT_TESTS NET-API-LOOKUP NET-API-LOOKUPHOST NET-API-LOOKUPPDC"
 
 for f in $NBT_TESTS; do
-    testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f || failed=`expr $failed + 1`
+    testit "$f" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ $f
 done
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_net.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_net.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_net.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -32,7 +32,7 @@
      esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done

Modified: branches/SAMBA_4_0/source/script/tests/test_pidl.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_pidl.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_pidl.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -11,7 +11,7 @@
 
 if $PERL -e 'eval require Test::More;' > /dev/null 2>&1; then
   for f in pidl/tests/*.pl; do
-     testit "$f" $PERL $f || failed=`expr $failed + 1`
+     testit "$f" $PERL $f
   done
 else 
    echo "Skipping pidl tests - Test::More not installed"

Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_posix.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_posix.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -46,7 +46,7 @@
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_quick.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_quick.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -32,7 +32,7 @@
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_rpc.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_rpc.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_rpc.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -35,7 +35,7 @@
      esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done
@@ -49,7 +49,7 @@
      esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done

Modified: branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_rpc_quick.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -32,7 +32,7 @@
    esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*" || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -U"$username"%"$password" -W $domain $t "$*"
    done
  done
 done

Modified: branches/SAMBA_4_0/source/script/tests/test_session_key.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_session_key.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_session_key.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -37,18 +37,18 @@
         "-k no --option=gensec:spnego=no --option=clientntlmv2auth=yes" \
         "-k no --option=usespnego=no"; do
    name="RPC-SECRETS on $transport with $bindoptions with NTLM2:$ntlm2 KEYEX:$keyexchange LM_KEY:$lm_key $ntlmoptions"
-   testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" --option=ntlmssp_client:keyexchange=$keyexchange --option=ntlmssp_client:ntlm2=$ntlm2 --option=ntlmssp_client:lm_key=$lm_key $ntlmoptions -U"$username"%"$password" -W $domain --option=gensec:target_hostname=$netbios_name RPC-SECRETS "$*" || failed=`expr $failed + 1`
+   testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" --option=ntlmssp_client:keyexchange=$keyexchange --option=ntlmssp_client:ntlm2=$ntlm2 --option=ntlmssp_client:lm_key=$lm_key $ntlmoptions -U"$username"%"$password" -W $domain --option=gensec:target_hostname=$netbios_name RPC-SECRETS "$*"
   done
  done
  done
  done
  name="RPC-SECRETS on $transport with $bindoptions with Kerberos"
- testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*" || failed=`expr $failed + 1`
+ testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
  name="RPC-SECRETS on $transport with $bindoptions with Kerberos - use target principal"
- testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*" || failed=`expr $failed + 1`
+ testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
 done
 name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login"
- testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*" || failed=`expr $failed + 1`
+ testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
 name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login, use target principal"
- testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*" || failed=`expr $failed + 1`
+ testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server" -k yes -U"$username"%"$password" -W $domain "--option=clientusespnegoprincipal=yes" "--option=gensec:fake_gssapi_krb5=yes" "--option=gensec:gssapi_krb5=no" "--option=gensec:target_hostname=$netbios_name" RPC-SECRETS "$*"
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_simple.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_simple.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_simple.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -27,7 +27,7 @@
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_swig.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_swig.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_swig.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -16,9 +16,9 @@
 export LD_LIBRARY_PATH=bin:$LD_LIBRARY_PATH
 
 echo Testing tdb wrappers
-scripting/swig/torture/torture_tdb.py || failed=`expr $failed + 1`
+scripting/swig/torture/torture_tdb.py
 
 echo Testing ldb wrappers
-scripting/swig/torture/torture_ldb.py || failed=`expr $failed + 1`
+scripting/swig/torture/torture_ldb.py
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_w2k3.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_w2k3.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_w2k3.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -29,7 +29,7 @@
 failed=0
 
 name="RPC-SPOOLSS on ncacn_np"
-testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*" || failed=`expr $failed + 1`
+testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_np:"$server" $OPTIONS RPC-SPOOLSS "$*"
 
 for bindoptions in padcheck connect sign seal ntlm,sign ntlm,seal $VALIDATE bigendian; do
    for transport in ncacn_ip_tcp ncacn_np; do
@@ -39,14 +39,14 @@
      esac
    for t in $tests; do
     name="$t on $transport with $bindoptions"
-    testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $OPTIONS $t "$*" || failed=`expr $failed + 1`
+    testit "$name" bin/smbtorture $TORTURE_OPTIONS $transport:"$server[$bindoptions]" $OPTIONS $t "$*"
    done
  done
 done
 
 name="RPC-DRSUAPI on ncacn_ip_tcp with seal"
-testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal]" $OPTIONS RPC-DRSUAPI "$*" || failed=`expr $failed + 1`
+testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal]" $OPTIONS RPC-DRSUAPI "$*"
 name="RPC-DRSUAPI on ncacn_ip_tcp with seal,bigendian"
-testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal,bigendian]" $OPTIONS RPC-DRSUAPI "$*" || failed=`expr $failed + 1`
+testit "$name" bin/smbtorture $TORTURE_OPTIONS ncacn_ip_tcp:"$server[seal,bigendian]" $OPTIONS RPC-DRSUAPI "$*"
 
 testok $0 $failed

Modified: branches/SAMBA_4_0/source/script/tests/test_w2k3_file.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_w2k3_file.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/test_w2k3_file.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -46,7 +46,7 @@
     fi
     start=""
     name="$t"
-    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t || failed=`expr $failed + 1`
+    testit "$name" $VALGRIND bin/smbtorture $TORTURE_OPTIONS $ADDARGS $unc -U"$username"%"$password" $t
 done
 
 testok $0 $failed

Deleted: branches/SAMBA_4_0/source/script/tests/tests_client.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/tests_client.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/tests_client.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -1,3 +0,0 @@
-#!/bin/sh
- $SRCDIR/script/tests/test_smbclient.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX || totalfailed=`expr $totalfailed + $?`
- $SRCDIR/script/tests/test_cifsdd.sh $SERVER $USERNAME $PASSWORD $DOMAIN || totalfailed=`expr $totalfailed + $?`

Modified: branches/SAMBA_4_0/source/script/tests/tests_net.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/tests_net.sh	2007-01-26 13:03:28 UTC (rev 21028)
+++ branches/SAMBA_4_0/source/script/tests/tests_net.sh	2007-01-26 13:33:06 UTC (rev 21029)
@@ -1,2 +1,2 @@
 #!/bin/sh
- $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN || failed=`expr $failed + $?`
+ $SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN



More information about the samba-cvs mailing list