summaryrefslogtreecommitdiff
path: root/source4/selftest/samba4_tests.sh
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-27 16:03:00 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-27 16:03:00 +0100
commit48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a (patch)
treef204e65c0ab980834f314d13ce6b32721c8b7f66 /source4/selftest/samba4_tests.sh
parent3101cb888d5cbad785050b8491b138d683d444fb (diff)
parentb42e3fb232ca68e869de4b39826da861f48e6771 (diff)
downloadsamba-48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a.tar.gz
samba-48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a.tar.bz2
samba-48e9b4cea10ad182af5fd4260ca1b7403fcfbf3a.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit d96fcc52a70fd1236b767b1d88a39d78c4e8c48c)
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