Rev 11325: - Remove now unused failure checking code in
file:///home/jelmer/bzr.samba/SAMBA_4_0/
Jelmer Vernooij
jelmer at samba.org
Fri Jan 26 13:27:07 GMT 2007
------------------------------------------------------------
revno: 11325
revision-id: jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u
parent: svn-v2:21028 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Fri 2007-01-26 14:26:07 +0100
message:
- Remove now unused failure checking code
- Use --list option for smbtorture for local and nbt tests as well
removed:
source/script/tests/tests_client.sh svn-v2:13255 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftests_client.sh
modified:
source/script/tests/test_binding_string.sh svn-v2:3032 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_binding_string.sh
source/script/tests/test_echo.sh svn-v2:2305 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_echo.sh
source/script/tests/test_ejs.sh svn-v2:8269 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_ejs.sh
source/script/tests/test_ldap.sh svn-v2:6549 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_ldap.sh
source/script/tests/test_local.sh svn-v2:7434 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_local.sh
source/script/tests/test_nbt.sh svn-v2:8735 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_nbt.sh
source/script/tests/test_net.sh svn-v2:18017 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_net.sh
source/script/tests/test_pidl.sh svn-v2:6854 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_pidl.sh
source/script/tests/test_posix.sh svn-v2:3176 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_posix.sh
source/script/tests/test_quick.sh svn-v2:7933 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_quick.sh
source/script/tests/test_rpc.sh svn-v2:3393 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_rpc.sh
source/script/tests/test_rpc_quick.sh svn-v2:8525 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_rpc_quick.sh
source/script/tests/test_session_key.sh svn-v2:7684 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_session_key.sh
source/script/tests/test_simple.sh svn-v2:18569 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_simple.sh
source/script/tests/test_swig.sh svn-v2:14798 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_swig.sh
source/script/tests/test_w2k3.sh svn-v2:4560 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_w2k3.sh
source/script/tests/test_w2k3_file.sh svn-v2:8124 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftest_w2k3_file.sh
source/script/tests/tests_net.sh svn-v2:19708 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftests_net.sh
=== removed file 'source/script/tests/tests_client.sh'
--- a/source/script/tests/tests_client.sh 2006-09-15 22:39:30 +0000
+++ b/source/script/tests/tests_client.sh 1970-01-01 00:00:00 +0000
@@ -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 file 'source/script/tests/test_binding_string.sh'
--- a/source/script/tests/test_binding_string.sh 2005-11-21 04:18:43 +0000
+++ b/source/script/tests/test_binding_string.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_echo.sh'
--- a/source/script/tests/test_echo.sh 2006-09-11 00:43:48 +0000
+++ b/source/script/tests/test_echo.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_ejs.sh'
--- a/source/script/tests/test_ejs.sh 2006-12-14 08:25:24 +0000
+++ b/source/script/tests/test_ejs.sh 2007-01-26 13:26:07 +0000
@@ -21,18 +21,17 @@
PATH=bin:$PATH
export PATH
-testit "base.js" $SCRIPTDIR/base.js $CONFIGURATION || failed=`expr $failed + 1`
-
-for f in samr.js echo.js; do
- testit "$f" $SCRIPTDIR/$f $CONFIGURATION ncalrpc: -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
-done
-
-testit "ejsnet.js" $SCRIPTDIR/ejsnet.js $CONFIGURATION -U$USERNAME%$PASSWORD $DOMAIN ejstestuser || failed=`expr $failed + 1`
-
-testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION || failed=`expr $failed + 1`
-
-testit "samba3sam.js" $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/ || failed=`expr $failed + 1`
-
-testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD || failed=`expr $failed + 1`
+testit "base.js" $SCRIPTDIR/base.js $CONFIGURATION
+
+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
+
+testit "ldb.js" $SCRIPTDIR/ldb.js `pwd` $CONFIGURATION
+
+testit "samba3sam.js" $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
+
+testit "winreg" scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U$USERNAME%$PASSWORD
testok $0 $failed
=== modified file 'source/script/tests/test_ldap.sh'
--- a/source/script/tests/test_ldap.sh 2007-01-25 12:39:13 +0000
+++ b/source/script/tests/test_ldap.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_local.sh'
--- a/source/script/tests/test_local.sh 2007-01-25 12:39:13 +0000
+++ b/source/script/tests/test_local.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_nbt.sh'
--- a/source/script/tests/test_nbt.sh 2006-10-16 13:06:41 +0000
+++ b/source/script/tests/test_nbt.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_net.sh'
--- a/source/script/tests/test_net.sh 2006-10-24 02:50:17 +0000
+++ b/source/script/tests/test_net.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_pidl.sh'
--- a/source/script/tests/test_pidl.sh 2006-09-08 04:54:30 +0000
+++ b/source/script/tests/test_pidl.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_posix.sh'
--- a/source/script/tests/test_posix.sh 2007-01-26 13:03:28 +0000
+++ b/source/script/tests/test_posix.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_quick.sh'
--- a/source/script/tests/test_quick.sh 2006-09-16 05:06:57 +0000
+++ b/source/script/tests/test_quick.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_rpc.sh'
--- a/source/script/tests/test_rpc.sh 2007-01-16 14:44:23 +0000
+++ b/source/script/tests/test_rpc.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_rpc_quick.sh'
--- a/source/script/tests/test_rpc_quick.sh 2006-09-16 05:06:57 +0000
+++ b/source/script/tests/test_rpc_quick.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_session_key.sh'
--- a/source/script/tests/test_session_key.sh 2006-11-15 17:01:26 +0000
+++ b/source/script/tests/test_session_key.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_simple.sh'
--- a/source/script/tests/test_simple.sh 2006-09-15 21:05:03 +0000
+++ b/source/script/tests/test_simple.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_swig.sh'
--- a/source/script/tests/test_swig.sh 2006-05-02 10:46:03 +0000
+++ b/source/script/tests/test_swig.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_w2k3.sh'
--- a/source/script/tests/test_w2k3.sh 2006-09-11 00:43:48 +0000
+++ b/source/script/tests/test_w2k3.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/test_w2k3_file.sh'
--- a/source/script/tests/test_w2k3_file.sh 2006-10-16 13:06:41 +0000
+++ b/source/script/tests/test_w2k3_file.sh 2007-01-26 13:26:07 +0000
@@ -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 file 'source/script/tests/tests_net.sh'
--- a/source/script/tests/tests_net.sh 2006-11-14 23:17:39 +0000
+++ b/source/script/tests/tests_net.sh 2007-01-26 13:26:07 +0000
@@ -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