summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--testsuite/build_farm/basicsmb.fns11
-rw-r--r--testsuite/build_farm/basicsmb.smb.conf.server3
-rw-r--r--testsuite/build_farm/basicsmb.smb.conf.template2
-rw-r--r--testsuite/build_farm/runlist4
4 files changed, 12 insertions, 8 deletions
diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index 3929c48a39..592cb62de4 100644
--- a/testsuite/build_farm/basicsmb.fns
+++ b/testsuite/build_farm/basicsmb.fns
@@ -2,7 +2,8 @@ test_smb_conf_setup() {
cat basicsmb.smb.conf.template | \
sed "s|PREFIX|$prefix|g" | \
sed "s|BUILD_FARM|$pwd|g" | \
- sed "s|WHOAMI|$whoami|g" \
+ sed "s|WHOAMI|$whoami|g" | \
+ sed "s|LOGLEVEL|$loglevel|g" \
> $prefix/lib/smb.conf
echo "127.0.0.1 localhost">$prefix/lib/lmhosts
@@ -10,10 +11,10 @@ test_smb_conf_setup() {
echo "127.0.0.1 USER">>$prefix/lib/lmhosts
echo "127.0.0.1 SERVER">>$prefix/lib/lmhosts
echo "127.0.0.1 DOMAIN">>$prefix/lib/lmhosts
- cp -f basicsmb.smb.conf.share $prefix/lib/smb.conf.share
- cp -f basicsmb.smb.conf.user $prefix/lib/smb.conf.user
- cp -f basicsmb.smb.conf.server $prefix/lib/smb.conf.server
- cp -f basicsmb.smb.conf.domain $prefix/lib/smb.conf.domain
+ cp basicsmb.smb.conf.share $prefix/lib/smb.conf.share
+ cp basicsmb.smb.conf.user $prefix/lib/smb.conf.user
+ cp basicsmb.smb.conf.server $prefix/lib/smb.conf.server
+ cp basicsmb.smb.conf.domain $prefix/lib/smb.conf.domain
touch $prefix/lib/smb.conf.
touch $prefix/lib/smb.conf.localhost
}
diff --git a/testsuite/build_farm/basicsmb.smb.conf.server b/testsuite/build_farm/basicsmb.smb.conf.server
index 5db63b0473..0b50144119 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.server
+++ b/testsuite/build_farm/basicsmb.smb.conf.server
@@ -1,2 +1,3 @@
security=server
-password server=localhost
+password server=user
+smb password file=/dev/null
diff --git a/testsuite/build_farm/basicsmb.smb.conf.template b/testsuite/build_farm/basicsmb.smb.conf.template
index b0ecc0946d..6785866fc1 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.template
+++ b/testsuite/build_farm/basicsmb.smb.conf.template
@@ -1,7 +1,7 @@
[global]
netbios name = BUILDFARM
workgroup = TESTWG
- log level = 3
+ log level = LOGLEVEL
debug timestamp = no
encrypt passwords = yes
server string = Samba %v Build Farm Tests
diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
index 6b1b0f2e6b..aac41215aa 100644
--- a/testsuite/build_farm/runlist
+++ b/testsuite/build_farm/runlist
@@ -1 +1,3 @@
-TEST_ALL="basicsmb-sharelist basicsmb-sharesec basicsmb-usersec basicsmb-serversec basicsmb-shareguest torture-FDPASS torture-LOCK1 torture-LOCK2 torture-LOCK3 torture-LOCK4 torture-LOCK5 torture-UNLINK torture-BROWSE torture-ATTR torture-TRANS2 torture-TORTURE torture-OPLOCK1 torture-OPLOCK3 torture-DIR torture-DENY1 torture-DENY2 torture-TCON torture-RW1 torture-RW2 torture-OPEN torture-DELETE"
+TEST_ALL="basicsmb-sharelist basicsmb-sharesec basicsmb-usersec basicsmb-shareguest torture-FDPASS torture-LOCK1 torture-LOCK2 torture-LOCK3 torture-LOCK4 torture-LOCK5 torture-UNLINK torture-BROWSE torture-ATTR torture-TRANS2 torture-TORTURE torture-OPLOCK1 torture-OPLOCK3 torture-DIR torture-DENY1 torture-DENY2 torture-TCON torture-RW1 torture-RW2 torture-OPEN torture-DELETE"
+
+#basicsmb-serversec