Move build farm template files to their own subdirectory so that their

names can be shortened to 30 characters. Helps Stratus VOS, which has a
32-character file name limit.

diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
index bb177704ef307f118a48b4562e38e03738f32776..4410feff3ae5704660ba63a34b8be25acc5ec60a 100644 (file)
--- a/testsuite/build_farm/basicsmb.fns
+++ b/testsuite/build_farm/basicsmb.fns
@@ -22,7 +22,7 @@
 # says it's not done consistently.
 
 template_setup() {
-       cat $1.template | \
+       cat template/$1 | \
               sed "s|PREFIX|$prefix|g" | \
              sed "s|BUILD_FARM|$test_root|g" | \
              sed "s|WHOAMI|$whoami|g" | \
@@ -52,13 +52,16 @@ test_smb_conf_setup() {
        exit 1
     esac
 
+#   Please keep these names under 15 characters,
+#   so that the final name is 31 characters or fewer.
+
     template_smb_conf_setup 
     template_smb_conf_setup .hostsequiv
     template_smb_conf_setup .validusers
     template_smb_conf_setup .invalidusers
     template_smb_conf_setup .preexec
     template_smb_conf_setup .preexec_close
-    template_smb_conf_setup .preexec_cl_fail
+    template_smb_conf_setup .preexec_cl_fl
 
     template_setup preexec lib/preexec
 

diff --git a/testsuite/build_farm/basicsmb.smb.conf.template b/testsuite/build_farm/template/basicsmb.smb.conf
similarity index 100%
rename from testsuite/build_farm/basicsmb.smb.conf.template
rename to testsuite/build_farm/template/basicsmb.smb.conf

diff --git a/testsuite/build_farm/basicsmb.smb.conf.hostsequiv.template b/testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv
similarity index 100%
rename from testsuite/build_farm/basicsmb.smb.conf.hostsequiv.template
rename to testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv

diff --git a/testsuite/build_farm/basicsmb.smb.conf.invalidusers.template b/testsuite/build_farm/template/basicsmb.smb.conf.invalidusers
similarity index 100%
rename from testsuite/build_farm/basicsmb.smb.conf.invalidusers.template
rename to testsuite/build_farm/template/basicsmb.smb.conf.invalidusers

diff --git a/testsuite/build_farm/basicsmb.smb.conf.preexec.template b/testsuite/build_farm/template/basicsmb.smb.conf.preexec
similarity index 100%
rename from testsuite/build_farm/basicsmb.smb.conf.preexec.template
rename to testsuite/build_farm/template/basicsmb.smb.conf.preexec

diff --git a/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template b/testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl
similarity index 100%
rename from testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template
rename to testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl

diff --git a/testsuite/build_farm/basicsmb.smb.conf.preexec_close.template b/testsuite/build_farm/template/basicsmb.smb.conf.preexec_close
similarity index 100%
rename from testsuite/build_farm/basicsmb.smb.conf.preexec_close.template
rename to testsuite/build_farm/template/basicsmb.smb.conf.preexec_close

diff --git a/testsuite/build_farm/basicsmb.smb.conf.validusers.template b/testsuite/build_farm/template/basicsmb.smb.conf.validusers
similarity index 100%
rename from testsuite/build_farm/basicsmb.smb.conf.validusers.template
rename to testsuite/build_farm/template/basicsmb.smb.conf.validusers

diff --git a/testsuite/build_farm/preexec.template b/testsuite/build_farm/template/preexec
similarity index 100%
rename from testsuite/build_farm/preexec.template
rename to testsuite/build_farm/template/preexec