summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-02 12:53:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:03:30 -0500
commitb77fabc2747cd02f7204b781d98a5f136cb158ea (patch)
tree9360718eefbf630e2a1c47abd14511506d06f421
parent78996e64b4c066ce9476448fec4375f47158c7fd (diff)
downloadsamba-b77fabc2747cd02f7204b781d98a5f136cb158ea.tar.gz
samba-b77fabc2747cd02f7204b781d98a5f136cb158ea.tar.bz2
samba-b77fabc2747cd02f7204b781d98a5f136cb158ea.zip
r24891: Fix smbtorture to exit non-zero if a test suite wasn't found.
(This used to be commit 44139acf3045149de5bbbbdfd6e0304fc9e0b8dd)
-rwxr-xr-xsource4/selftest/test_session_key.sh4
-rw-r--r--source4/torture/smbtorture.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/selftest/test_session_key.sh b/source4/selftest/test_session_key.sh
index 90f5585cd6..93be4f99f2 100755
--- a/source4/selftest/test_session_key.sh
+++ b/source4/selftest/test_session_key.sh
@@ -25,6 +25,6 @@ plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERV
name="RPC-SECRETS on $transport with $bindoptions with Kerberos - use target principal"
plantest "$name" dc $samba4bindir/smbtorture $TORTURE_OPTIONS $transport:"\$SERVER[$bindoptions]" -k yes -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN "--option=clientusespnegoprincipal=yes" "--option=gensec:target_hostname=\$NETBIOSNAME" RPC-SECRETS "$*"
name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login"
- plantest "$name" dc $samba4bindir/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=\$NETBIOSNAME" RPC-SECRETS-none "$*"
+ plantest "$name" dc $samba4bindir/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=\$NETBIOSNAME" "RPC-SECRETS-none*" "$*"
name="RPC-SECRETS on $transport with Kerberos - use Samba3 style login, use target principal"
- plantest "$name" dc $samba4bindir/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=\$NETBIOSNAME" RPC-SECRETS-none "$*"
+ plantest "$name" dc $samba4bindir/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=\$NETBIOSNAME" "RPC-SECRETS-none*" "$*"
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 89e13b0645..6fbd824ecb 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -665,7 +665,7 @@ int main(int argc,char *argv[])
}
}
- if (torture->returncode) {
+ if (torture->returncode && correct) {
return(0);
} else {
return(1);