summaryrefslogtreecommitdiff
path: root/source4/selftest/samba4_tests.sh
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-04-17 15:21:08 +0200
committerAndrew Tridgell <tridge@samba.org>2008-04-17 15:21:08 +0200
commitdc74e0fad683cb0ef9ee5996aedadd4c377a0f00 (patch)
treee33375abeb4ec70f646e420adfe9221e1bb87a2d /source4/selftest/samba4_tests.sh
parent11703b298685c9984a6a3c3a64eddb8a1a516b90 (diff)
parentef457187b4372f039f84fbb4f6e4f0fcffd67b5b (diff)
downloadsamba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.gz
samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.bz2
samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3ab9abf40605a4a6b220faeebaef81546a8d87a0)
Diffstat (limited to 'source4/selftest/samba4_tests.sh')
-rwxr-xr-xsource4/selftest/samba4_tests.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 730846dae3..725fde2c7d 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"
@@ -285,7 +288,7 @@ done
DATADIR=$samba4srcdir/../testdata
-plantest "js.samba3sam" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
+plantest "js.samba3sam" none $samba4bindir/smbscript $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
# Domain Member Tests