Merge from HEAD - updates to the build farm, /bin/sh can swallow return values,

and add the RENAME torture test.
(This used to be commit fbd49f915f620831d6b04496986bb24df372cda2)

diff --git a/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template b/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template
index 5578e7110e13a2c2b9385d21e0dafbf7b9f22a70..4a6fae57bc06613498d41b6e28c021bc64e2753e 100644 (file)
--- a/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template
+++ b/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template
@@ -1,2 +1,2 @@
 preexec close = yes
-preexec = /bin/sh PREFIX/lib/preexec_does_not_exist
\ No newline at end of file
+preexec = PREFIX/lib/preexec_does_not_exist

diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
index bdf92f8712dea346b85b615207859a10b18862d8..b847e13fbc8432da1f0428c057607aaf147f7137 100644 (file)
--- a/testsuite/build_farm/runlist
+++ b/testsuite/build_farm/runlist
@@ -10,6 +10,7 @@ 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"
+torture-RW2 torture-OPEN torture-RENAME \
+torture-DELETE"
 
 #basicsmb-serversec