summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-04-17 11:25:19 +0200
committerAndrew Bartlett <abartlet@samba.org>2008-04-17 11:25:19 +0200
commiteb8a4e28830a01bcb990874e69f5b52907a278c6 (patch)
tree36f1bf9027ee523296c05f9a1947d9d92ebc5560
parent0236a50c114bdd53527b7dc0acd81925607621c2 (diff)
downloadsamba-eb8a4e28830a01bcb990874e69f5b52907a278c6.tar.gz
samba-eb8a4e28830a01bcb990874e69f5b52907a278c6.tar.bz2
samba-eb8a4e28830a01bcb990874e69f5b52907a278c6.zip
Run more tests that were previously skipped.
Andrew Bartlett (This used to be commit 4e06b1d684d6893d79dd6cbd32c2f868dcc559da)
-rw-r--r--source4/samba4-skip6
-rwxr-xr-xsource4/selftest/samba4_tests.sh5
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/samba4-skip b/source4/samba4-skip
index caeb1e044d..f4330b9c03 100644
--- a/source4/samba4-skip
+++ b/source4/samba4-skip
@@ -5,11 +5,11 @@ base.casetable
base.nttrans
.*base.bench.holdcon.* # Very slow
base.scan.maxfid
-raw.hold.oplock
-raw.ping.pong
+raw.hold.oplock # Not a test, but a way to block other clients for a test
+raw.ping.pong # Needs second server to test
rpc.samr_accessmask
raw.scan.eamax
-raw.qfileinfo.ipc
+samba4.ntvfs.cifs.raw.qfileinfo.ipc
base.utable
base.smb
smb2.notify
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 730846dae3..3b61a97459 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -219,13 +219,16 @@ plantest "rpc.echo on ncacn_np over smb2" dc $smb4torture ncacn_np:"\$SERVER[smb
# Tests against the NTVFS POSIX backend
NTVFSARGS="--option=torture:sharedelay=100000 --option=torture:oplocktimeout=3"
smb2=`$smb4torture --list | grep "^SMB2-" | xargs`
-raw=`$smb4torture --list | grep "^RAW-" | xargs`
+#The QFILEINFO-IPC test needs to be on ipc$
+raw=`$smb4torture --list | grep "^RAW-" | grep -v "RAW-QFILEINFO-IPC"| xargs`
base=`$smb4torture --list | grep "^BASE-" | xargs`
for t in $base $raw $smb2; do
plansmbtorturetest "$t" dc $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $NTVFSARGS
done
+plansmbtorturetest "RAW-QFILEINFO-IPC" dc $ADDARGS //\$SERVER/ipc$ -U"\$USERNAME"%"\$PASSWORD"
+
rap=`$smb4torture --list | grep "^RAP-" | xargs`
for t in $rap; do
plansmbtorturetest "$t" dc $ADDARGS //\$SERVER/IPC\\\$ -U"\$USERNAME"%"\$PASSWORD"