summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--selftest/target/Samba3.pm1
-rwxr-xr-xsource3/script/tests/selftest.sh1
-rwxr-xr-xsource3/script/tests/test_posix_s3.sh5
3 files changed, 6 insertions, 1 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 47b7913522..c03e188792 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -521,6 +521,7 @@ sub provision($$$$$$)
# min receivefile size = 4000
+ max protocol = SMB2
read only = no
smbd:sharedelay = 100000
# smbd:writetimeupdatedelay = 500000
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index 5059ceab27..fba43e3306 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -320,6 +320,7 @@ cat >$SERVERCONFFILE<<EOF
# min receivefile size = 4000
+ max protocol = SMB2
read only = no
smbd:sharedelay = 100000
# smbd:writetimeupdatedelay = 500000
diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh
index 59551d0ba5..3c6699e343 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -37,6 +37,9 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH RAW-SFILEINFO-RENAME"
raw="$raw RAW-SAMBA3CASEINSENSITIVE RAW-SAMBA3POSIXTIMEDLOCK"
raw="$raw RAW-SAMBA3ROOTDIRFID RAW-SFILEINFO-END-OF-FILE"
+smb2="SMB2-LOCK SMB2-READ SMB2-COMPOUND SMB2-CONNECT SMB2-SCAN SMB2-SCANFIND"
+smb2="$smb2 SMB2-BENCH-OPLOCK"
+
rpc="RPC-AUTHCONTEXT RPC-SAMBA3-BIND RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC"
rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-SAMBA3-WINREG"
rpc="$rpc RPC-SAMBA3-GETALIASMEMBERSHIP-0"
@@ -62,7 +65,7 @@ rap="RAP-BASIC RAP-RPC RAP-PRINTING RAP-SAM"
# tests, so leaving it alone for now -- jpeach
unix="UNIX-INFO2"
-tests="$base $raw $rpc $unix $local $winbind $rap"
+tests="$base $raw $smb2 $rpc $unix $local $winbind $rap"
if test "x$POSIX_SUBTESTS" != "x" ; then
tests="$POSIX_SUBTESTS"