summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/build_farm/basicsmb-domainsec.test4
-rw-r--r--testsuite/build_farm/runlist10
-rw-r--r--testsuite/build_farm/template/basicsmb.smb.conf49
-rw-r--r--testsuite/build_farm/torture-DIR1.test2
-rw-r--r--testsuite/build_farm/torture-FDPASS.test2
-rw-r--r--testsuite/build_farm/torture-FDSESS.test2
-rw-r--r--testsuite/build_farm/torture-LOCK6.test2
-rw-r--r--testsuite/build_farm/torture-LOCK7.test2
-rw-r--r--testsuite/build_farm/torture-MANGLE.test2
-rw-r--r--testsuite/build_farm/torture-PROPERTIES.test2
-rw-r--r--testsuite/build_farm/torture-TCON1.test2
-rw-r--r--testsuite/build_farm/torture-TCON2.test2
-rw-r--r--testsuite/build_farm/torture-TCONDEV.test2
-rw-r--r--testsuite/build_farm/torture-XCOPY.test2
-rw-r--r--testsuite/build_farm/torture_setup.fns2
15 files changed, 30 insertions, 57 deletions
diff --git a/testsuite/build_farm/basicsmb-domainsec.test b/testsuite/build_farm/basicsmb-domainsec.test
index 848cf69a75..eb0a5c81aa 100644
--- a/testsuite/build_farm/basicsmb-domainsec.test
+++ b/testsuite/build_farm/basicsmb-domainsec.test
@@ -4,8 +4,8 @@
test_joindomain() {
test_join_domain_password="$1"
- echo "$prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password -d$loglevel"
- $prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password -d$loglevel
+ echo "$prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password"
+ $prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password
status=$?
if [ $status = 0 ]; then
echo "'net rpc join' correctly joined the domain"
diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
index b847e13fbc..5996f24ba8 100644
--- a/testsuite/build_farm/runlist
+++ b/testsuite/build_farm/runlist
@@ -6,11 +6,13 @@ basicsmb-hostsdeny basicsmb-remote-pass-change \
basicsmb-preexec \
torture-FDPASS torture-LOCK1 torture-LOCK2 \
torture-LOCK3 torture-LOCK4 torture-LOCK5 \
+torture-LOCK6 torture-LOCK7 \
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-RENAME \
-torture-DELETE"
+torture-OPLOCK3 torture-DIR torture-DIR1 torture-DENY1 \
+torture-DENY2 torture-TCON torture-TCON2 torture-TCONDEV \
+torture-RW1 torture-RW2 torture-OPEN torture-XCOPY \
+torture-RENAME torture-DELETE torture-PROPERTIES \
+torture-MANGLE torture-FDSESS"
#basicsmb-serversec
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf b/testsuite/build_farm/template/basicsmb.smb.conf
deleted file mode 100644
index 9b8483db16..0000000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-[global]
- netbios name = BUILDFARM
- workgroup = TESTWG
- log level = LOGLEVEL
- debug timestamp = no
- encrypt passwords = yes
- server string = Samba %v Build Farm Tests
- name resolve order = lmhosts
- guest account = WHOAMI
- domain logons = yes
-
- strict locking = yes
-
- include = PREFIX/lib/smb.conf.%L
-
- add machine script = useradd %u -d /dev/null -s /bin/false
-
- panic action = /bin/sh BUILD_FARM/samba/testsuite/build_farm/backtrace %d
-
- passdb backend = smbpasswd_nua
-
- non unix account range = 10000-200000
- map hidden = yes
- create mask = 0777
-
-[test]
- path = PREFIX/testdir
- read only = no
-
-[samba]
- path = BUILD_FARM/samba
- read only = yes
- comment = Samba HEAD Sources
-
-[samba_2_2]
- path = BUILD_FARM/samba_2_2
- read only = yes
- comment = Samba 2.2. Sources
-
-[rsync]
- path = BUILD_FARM/rsync
- read only = yes
- comment = Rsync Sources
-
-[guest_share]
- path = PREFIX
- guest ok = yes
- read only = yes
- comment = Unauthenticated share for use in share level test
diff --git a/testsuite/build_farm/torture-DIR1.test b/testsuite/build_farm/torture-DIR1.test
new file mode 100644
index 0000000000..6cc075e9ba
--- /dev/null
+++ b/testsuite/build_farm/torture-DIR1.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "DIR1"
diff --git a/testsuite/build_farm/torture-FDPASS.test b/testsuite/build_farm/torture-FDPASS.test
index e8af277d43..40ffdb666d 100644
--- a/testsuite/build_farm/torture-FDPASS.test
+++ b/testsuite/build_farm/torture-FDPASS.test
@@ -1,2 +1,2 @@
. torture_setup.fns
-test_torture "FDPASS"
+test_torture "FDSESS"
diff --git a/testsuite/build_farm/torture-FDSESS.test b/testsuite/build_farm/torture-FDSESS.test
new file mode 100644
index 0000000000..e8af277d43
--- /dev/null
+++ b/testsuite/build_farm/torture-FDSESS.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "FDPASS"
diff --git a/testsuite/build_farm/torture-LOCK6.test b/testsuite/build_farm/torture-LOCK6.test
new file mode 100644
index 0000000000..78e139e310
--- /dev/null
+++ b/testsuite/build_farm/torture-LOCK6.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "LOCK6"
diff --git a/testsuite/build_farm/torture-LOCK7.test b/testsuite/build_farm/torture-LOCK7.test
new file mode 100644
index 0000000000..fc967fca57
--- /dev/null
+++ b/testsuite/build_farm/torture-LOCK7.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "LOCK7"
diff --git a/testsuite/build_farm/torture-MANGLE.test b/testsuite/build_farm/torture-MANGLE.test
new file mode 100644
index 0000000000..5a3d478a45
--- /dev/null
+++ b/testsuite/build_farm/torture-MANGLE.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "MANGLE"
diff --git a/testsuite/build_farm/torture-PROPERTIES.test b/testsuite/build_farm/torture-PROPERTIES.test
new file mode 100644
index 0000000000..91fde27f8a
--- /dev/null
+++ b/testsuite/build_farm/torture-PROPERTIES.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "PROPERTIES"
diff --git a/testsuite/build_farm/torture-TCON1.test b/testsuite/build_farm/torture-TCON1.test
new file mode 100644
index 0000000000..3c9267640d
--- /dev/null
+++ b/testsuite/build_farm/torture-TCON1.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCON1"
diff --git a/testsuite/build_farm/torture-TCON2.test b/testsuite/build_farm/torture-TCON2.test
new file mode 100644
index 0000000000..1f30a975da
--- /dev/null
+++ b/testsuite/build_farm/torture-TCON2.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCON2"
diff --git a/testsuite/build_farm/torture-TCONDEV.test b/testsuite/build_farm/torture-TCONDEV.test
new file mode 100644
index 0000000000..18bd5345fb
--- /dev/null
+++ b/testsuite/build_farm/torture-TCONDEV.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "TCONDEV"
diff --git a/testsuite/build_farm/torture-XCOPY.test b/testsuite/build_farm/torture-XCOPY.test
new file mode 100644
index 0000000000..94cc797976
--- /dev/null
+++ b/testsuite/build_farm/torture-XCOPY.test
@@ -0,0 +1,2 @@
+. torture_setup.fns
+test_torture "XCOPY"
diff --git a/testsuite/build_farm/torture_setup.fns b/testsuite/build_farm/torture_setup.fns
index bf5146148e..a42be94129 100644
--- a/testsuite/build_farm/torture_setup.fns
+++ b/testsuite/build_farm/torture_setup.fns
@@ -12,7 +12,7 @@ test_torture() {
if [ $status = 0 ]; then
echo "smbtorture test $torture_test worked"
else
- echo "smbtorture test $torture_test FAILED!"
+ echo "smbtorture test $torture_test FAILED (status $status)!"
return 1
fi
return 0
generated by cgit (git 2.34.1) at 2024-11-29 05:15:35 +0000