diff options
| author | Paul Green <paulg@samba.org> | 2003-04-23 17:15:10 +0000 |
|---|---|---|
| committer | Paul Green <paulg@samba.org> | 2003-04-23 17:15:10 +0000 |
| commit | 7c770146d611a22167003487c27f14192e7728c2 (patch) | |
| tree | 49670d9960dfbc60f78e4b36ed1cc73ce8cb85e0 /testsuite | |
| parent | a141af397eb249e25c4c0335c9c42de5826717e2 (diff) | |
| download | samba-7c770146d611a22167003487c27f14192e7728c2.tar.gz samba-7c770146d611a22167003487c27f14192e7728c2.tar.bz2 samba-7c770146d611a22167003487c27f14192e7728c2.zip | |
Backport changes from head to shorten the filenames of the test cases.
(This used to be commit e2315ebc9a653a3c804323d55a96e0b378351e8d)
Diffstat (limited to 'testsuite')
9 files changed, 5 insertions, 63 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.hostsequiv.template b/testsuite/build_farm/basicsmb.smb.conf.hostsequiv.template deleted file mode 100644 index 750af74f59..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.hostsequiv.template +++ /dev/null @@ -1,3 +0,0 @@ - hostname lookups = no - hosts equiv=PREFIX/lib/hosts.equiv - auth methods = hostsequiv diff --git a/testsuite/build_farm/basicsmb.smb.conf.invalidusers.template b/testsuite/build_farm/basicsmb.smb.conf.invalidusers.template deleted file mode 100644 index a96a316db9..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.invalidusers.template +++ /dev/null @@ -1 +0,0 @@ - invalid users = WHOAMI diff --git a/testsuite/build_farm/basicsmb.smb.conf.preexec.template b/testsuite/build_farm/basicsmb.smb.conf.preexec.template deleted file mode 100644 index cc34872c5d..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.preexec.template +++ /dev/null @@ -1 +0,0 @@ -preexec = /bin/sh PREFIX/lib/preexec diff --git a/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template b/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template deleted file mode 100644 index 4a6fae57bc..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.preexec_cl_fail.template +++ /dev/null @@ -1,2 +0,0 @@ -preexec close = yes -preexec = PREFIX/lib/preexec_does_not_exist diff --git a/testsuite/build_farm/basicsmb.smb.conf.preexec_close.template b/testsuite/build_farm/basicsmb.smb.conf.preexec_close.template deleted file mode 100644 index 3aac6998bf..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.preexec_close.template +++ /dev/null @@ -1,2 +0,0 @@ -preexec close = yes -preexec = /bin/sh PREFIX/lib/preexec diff --git a/testsuite/build_farm/basicsmb.smb.conf.template b/testsuite/build_farm/basicsmb.smb.conf.template deleted file mode 100644 index 9b8483db16..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.template +++ /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/basicsmb.smb.conf.validusers.template b/testsuite/build_farm/basicsmb.smb.conf.validusers.template deleted file mode 100644 index d4a85e0a02..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.validusers.template +++ /dev/null @@ -1 +0,0 @@ - valid users = WHOAMI diff --git a/testsuite/build_farm/preexec.template b/testsuite/build_farm/preexec.template deleted file mode 100644 index e417d6a017..0000000000 --- a/testsuite/build_farm/preexec.template +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -echo "Test worked" > PREFIX/testdir/preexec_touch |