diff options
| -rw-r--r-- | testsuite/build_farm/basicsmb.fns | 7 | ||||
| -rw-r--r-- | testsuite/build_farm/template/basicsmb.smb.conf (renamed from testsuite/build_farm/basicsmb.smb.conf.template) | 0 | ||||
| -rw-r--r-- | testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv (renamed from testsuite/build_farm/basicsmb.smb.conf.hostsequiv.template) | 0 | ||||
| -rw-r--r-- | testsuite/build_farm/template/basicsmb.smb.conf.invalidusers (renamed from testsuite/build_farm/basicsmb.smb.conf.invalidusers.template) | 0 | ||||
| -rw-r--r-- | testsuite/build_farm/template/basicsmb.smb.conf.preexec (renamed from testsuite/build_farm/basicsmb.smb.conf.preexec.template) | 0 | ||||
| -rw-r--r-- | testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl (renamed from testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template) | 0 | ||||
| -rw-r--r-- | testsuite/build_farm/template/basicsmb.smb.conf.preexec_close (renamed from testsuite/build_farm/basicsmb.smb.conf.preexec_close.template) | 0 | ||||
| -rw-r--r-- | testsuite/build_farm/template/basicsmb.smb.conf.validusers (renamed from testsuite/build_farm/basicsmb.smb.conf.validusers.template) | 0 | ||||
| -rw-r--r-- | testsuite/build_farm/template/preexec (renamed from testsuite/build_farm/preexec.template) | 0 |
9 files changed, 5 insertions, 2 deletions
diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns index bb177704ef..4410feff3a 100644 --- 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 index 9b8483db16..9b8483db16 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.template +++ b/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 index 750af74f59..750af74f59 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.hostsequiv.template +++ b/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 index a96a316db9..a96a316db9 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.invalidusers.template +++ b/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 index cc34872c5d..cc34872c5d 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.preexec.template +++ b/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 index 4a6fae57bc..4a6fae57bc 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template +++ b/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 index 3aac6998bf..3aac6998bf 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.preexec_close.template +++ b/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 index d4a85e0a02..d4a85e0a02 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.validusers.template +++ b/testsuite/build_farm/template/basicsmb.smb.conf.validusers diff --git a/testsuite/build_farm/preexec.template b/testsuite/build_farm/template/preexec index e417d6a017..e417d6a017 100644 --- a/testsuite/build_farm/preexec.template +++ b/testsuite/build_farm/template/preexec |