summaryrefslogtreecommitdiff
path: root/source4/selftest/samba4_tests.sh
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-02-26 16:19:57 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-02-26 16:19:57 +1100
commit864328e6563621a0b4df2d49e04ff3b23b68e1ca (patch)
tree01b5af0b454d7235b5118ae53d078429dca26619 /source4/selftest/samba4_tests.sh
parent2c8415f767ca20fe90a97f8623d1617e015f183a (diff)
parent1e5ced379361fbdc0ccc48ad012f388f2e737ca7 (diff)
downloadsamba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.tar.gz
samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.tar.bz2
samba-864328e6563621a0b4df2d49e04ff3b23b68e1ca.zip
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 35f7f488d84e3ec3224f3b40ff5881e91c11764d)
Diffstat (limited to 'source4/selftest/samba4_tests.sh')
-rwxr-xr-xsource4/selftest/samba4_tests.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index c57ec4d6bd..32386e5b9e 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -216,12 +216,13 @@ done
plantest "rpc.echo on ncacn_np over smb2" dc $smb4torture ncacn_np:"\$SERVER[smb2]" -U"\$USERNAME"%"\$PASSWORD" -W \$DOMAIN RPC-ECHO "$*"
# Tests against the NTVFS POSIX backend
+NTVFSARGS="--option=torture:sharedelay=100000"
smb2=`$smb4torture --list | grep "^SMB2-" | xargs`
raw=`$smb4torture --list | grep "^RAW-" | xargs`
base=`$smb4torture --list | grep "^BASE-" | xargs`
for t in $base $raw $smb2; do
- plansmbtorturetest "$t" dc $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD"
+ plansmbtorturetest "$t" dc $ADDARGS //\$SERVER/tmp -U"\$USERNAME"%"\$PASSWORD" $NTVFSARGS
done
rap=`$smb4torture --list | grep "^RAP-" | xargs`
@@ -231,7 +232,7 @@ done
# Tests against the NTVFS CIFS backend
for t in $base $raw; do
- plantest "ntvfs.cifs.`normalize_testname $t`" dc $VALGRIND $smb4torture //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $t
+ plantest "ntvfs.cifs.`normalize_testname $t`" dc $VALGRIND $smb4torture //\$NETBIOSNAME/cifs -U"\$USERNAME"%"\$PASSWORD" $NTVFSARGS $t
done
# Local tests