summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testsuite/build_farm/basicsmb-shareguest.test3
-rw-r--r--testsuite/build_farm/basicsmb.fns1
-rw-r--r--testsuite/build_farm/basicsmb.smb.conf.server2
-rw-r--r--testsuite/build_farm/runlist2
4 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/build_farm/basicsmb-shareguest.test b/testsuite/build_farm/basicsmb-shareguest.test
index 7b0175a6639..4ba445a17e3 100644
--- a/testsuite/build_farm/basicsmb-shareguest.test
+++ b/testsuite/build_farm/basicsmb-shareguest.test
@@ -14,8 +14,7 @@ test_listfilesguestshare() {
return 0
}
-password=samba
security=SHARE
-( test_smb_conf_setup && ( test_smbpasswd $password ) ) || exit 1
+( test_smb_conf_setup ) || exit 1
( test_listfilesguestshare $security ) || exit 1 \ No newline at end of file
diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index 592cb62de48..c127a4f3b90 100644
--- a/testsuite/build_farm/basicsmb.fns
+++ b/testsuite/build_farm/basicsmb.fns
@@ -7,6 +7,7 @@ test_smb_conf_setup() {
> $prefix/lib/smb.conf
echo "127.0.0.1 localhost">$prefix/lib/lmhosts
+ echo "127.0.0.1 BUILDFARM">>$prefix/lib/lmhosts
echo "127.0.0.1 SHARE">>$prefix/lib/lmhosts
echo "127.0.0.1 USER">>$prefix/lib/lmhosts
echo "127.0.0.1 SERVER">>$prefix/lib/lmhosts
diff --git a/testsuite/build_farm/basicsmb.smb.conf.server b/testsuite/build_farm/basicsmb.smb.conf.server
index 0b50144119f..ff858f947da 100644
--- a/testsuite/build_farm/basicsmb.smb.conf.server
+++ b/testsuite/build_farm/basicsmb.smb.conf.server
@@ -1,3 +1,3 @@
security=server
password server=user
-smb password file=/dev/null
+smb passwd file=/dev/null
diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
index aac41215aa2..ad5d12fb0f1 100644
--- a/testsuite/build_farm/runlist
+++ b/testsuite/build_farm/runlist
@@ -1,3 +1,3 @@
-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"
+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"
#basicsmb-serversec