summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-01-26 13:43:21 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:44:22 -0500
commit32dd550d1958cea0af8bfde6cb306f8a13246eb5 (patch)
tree060191cad4800d4bcf09b7b60fee180301971b61
parent37a13964ef7529cdcfee426e881a8a73fc027e03 (diff)
downloadsamba-32dd550d1958cea0af8bfde6cb306f8a13246eb5.tar.gz
samba-32dd550d1958cea0af8bfde6cb306f8a13246eb5.tar.xz
samba-32dd550d1958cea0af8bfde6cb306f8a13246eb5.zip
r21030: whoops, fix incorrect regex
(This used to be commit 2c6cc617f9cc84c1cd9f6652d3a8ac9c605ab42c)
-rwxr-xr-xsource4/script/tests/test_posix.sh5
-rwxr-xr-xsource4/script/tests/tests_all.sh1
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh
index ccd0d196b11..2e11fa0ace2 100755
--- a/source4/script/tests/test_posix.sh
+++ b/source4/script/tests/test_posix.sh
@@ -20,7 +20,10 @@ ADDARGS="$*"
incdir=`dirname $0`
. $incdir/test_functions.sh
-tests=`bin/smbtorture --list | grep "^(BASE|RAW|SMB2)-" | xargs`
+smb2=`bin/smbtorture --list | grep "^SMB2-" | xargs`
+raw=`bin/smbtorture --list | grep "^RAW-" | xargs`
+base=`bin/smbtorture --list | grep "^BASE-" | xargs`
+tests="$base $raw $smb2"
#
# please add tests you want to be skipped here!
diff --git a/source4/script/tests/tests_all.sh b/source4/script/tests/tests_all.sh
index 1c1303c4ab4..efabbec03b3 100755
--- a/source4/script/tests/tests_all.sh
+++ b/source4/script/tests/tests_all.sh
@@ -2,7 +2,6 @@
$SRCDIR/script/tests/test_ejs.sh $DOMAIN $USERNAME $PASSWORD
$SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
$SRCDIR/script/tests/test_nbt.sh $SERVER
- $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD ""
$SRCDIR/script/tests/test_rpc.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$SRCDIR/script/tests/test_net.sh $SERVER $USERNAME $PASSWORD $DOMAIN
$SRCDIR/script/tests/test_session_key.sh $SERVER $USERNAME $PASSWORD $DOMAIN $NETBIOSNAME