Allow us to vary the log-level, so we can run at level 1 normally,

and push it to 10 when we fail (we redo the test).

Also disable the server-level security testing till it know what it does

Andrew Bartlett
(This used to be commit 805c20452e98c5e3d3fb24537ce722d4318ffa90)

diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index 3929c48a3995c3654e6f42626fbfd7d7510583a4..592cb62de4893a3d105de9d36fc2173eca69c47f 100644 (file)
--- 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 5db63b0473e4082af2a607a4d7fbdcd859d8ce79..0b50144119f606e2f597aa54d42e0e49ef7fb683 100644 (file)
--- 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 b0ecc0946d50034cc34018048fe5bd8ec7dc98fd..6785866fc1066dcd72e685a3cf14f4153e1caff0 100644 (file)
--- 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 6b1b0f2e6bff4c22b4c38f350510dadc86686d4e..aac41215aa27cb03978a6f18b42247f75a618bcf 100644 (file)
--- 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