[PATCH] Remove unused selftest env variables + old build_farm testsuites
Tim Beale
timbeale at catalyst.net.nz
Mon Mar 11 20:32:13 UTC 2019
I started out removing a couple of unused selftest environment variables
and ended up ripping out all the old build_farm testsuites.
Also moved some of the environment variable-related code out of
selftest.pl and into Samba.pm, which is a bit closer to where the
variables are all actually defined.
CI pass: https://gitlab.com/catalyst-samba/samba/pipelines/51171570
Review appreciated. Thanks.
-------------- next part --------------
From 0599e96a58321eeb3caa3bb8d395f7352cf7bda8 Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
Date: Tue, 26 Feb 2019 12:11:45 +1300
Subject: [PATCH 1/6] selftest: Remove unused SELFTEST_INTERFACES
This doesn't appear to be used anywhere and dates back to 2008.
Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
---
selftest/selftest.pl | 5 -----
source4/scripting/devel/selftest-vars.sh | 1 -
2 files changed, 6 deletions(-)
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index f04e2b2..bb2122d 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -706,11 +706,6 @@ $ENV{SELFTEST_PREFIX} = "$prefix_abs";
$ENV{SELFTEST_TMPDIR} = "$tmpdir_abs";
$ENV{TMPDIR} = "$tmpdir_abs";
$ENV{TEST_DATA_PREFIX} = "$tmpdir_abs";
-if ($opt_socket_wrapper) {
- $ENV{SELFTEST_INTERFACES} = $interfaces;
-} else {
- $ENV{SELFTEST_INTERFACES} = "";
-}
if ($opt_quick) {
$ENV{SELFTEST_QUICK} = "1";
} else {
diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
index 50584a1..5d532f2 100644
--- a/source4/scripting/devel/selftest-vars.sh
+++ b/source4/scripting/devel/selftest-vars.sh
@@ -15,7 +15,6 @@ export SELFTEST_PREFIX=$PWD/st
export DOMAIN=SAMBADOMAIN
export BINDIR=./bin
export DC_SERVER_IP=127.0.0.21
-export SELFTEST_INTERFACES=127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8
export SOCKET_WRAPPER_DIR=$PWD/st/w
export DC_USERNAME=Administrator
export USERNAME=Administrator
--
2.7.4
From a8ea8649f2981e70478e3d1651d79a1f1e2b7eee Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
Date: Tue, 26 Feb 2019 13:26:25 +1300
Subject: [PATCH 2/6] selftest: Move @exported_envvars into Samba.pm
This brings it closer to the code that actually sets these variables
(i.e. Samba3/4.pm).
Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
---
selftest/selftest.pl | 102 ++------------------------------------------
selftest/target/Samba.pm | 107 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+), 98 deletions(-)
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index bb2122d..773b284 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -810,80 +810,6 @@ sub get_running_env($)
return $running_envs{$envname};
}
-my @exported_envvars = (
- # domain stuff
- "DOMAIN",
- "DNSNAME",
- "REALM",
- "DOMSID",
-
- # stuff related to a trusted domain
- "TRUST_SERVER",
- "TRUST_USERNAME",
- "TRUST_PASSWORD",
- "TRUST_DOMAIN",
- "TRUST_REALM",
- "TRUST_DOMSID",
-
- # domain controller stuff
- "DC_SERVER",
- "DC_SERVER_IP",
- "DC_SERVER_IPV6",
- "DC_NETBIOSNAME",
- "DC_NETBIOSALIAS",
-
- # server stuff
- "SERVER",
- "SERVER_IP",
- "SERVER_IPV6",
- "NETBIOSNAME",
- "NETBIOSALIAS",
- "SAMSID",
-
- # only use these 2 as a last resort. Some tests need to test both client-
- # side and server-side. In this case, run as default client, ans access
- # server's smb.conf as needed, typically using:
- # param.LoadParm(filename_for_non_global_lp=os.environ['SERVERCONFFILE'])
- "SERVERCONFFILE",
- "DC_SERVERCONFFILE",
-
- # user stuff
- "USERNAME",
- "USERID",
- "PASSWORD",
- "DC_USERNAME",
- "DC_PASSWORD",
-
- # UID/GID for rfc2307 mapping tests
- "UID_RFC2307TEST",
- "GID_RFC2307TEST",
-
- # misc stuff
- "KRB5_CONFIG",
- "KRB5CCNAME",
- "SELFTEST_WINBINDD_SOCKET_DIR",
- "NMBD_SOCKET_DIR",
- "LOCAL_PATH",
- "DNS_FORWARDER1",
- "DNS_FORWARDER2",
- "RESOLV_CONF",
- "UNACCEPTABLE_PASSWORD",
- "LOCK_DIR",
- "SMBD_TEST_LOG",
-
- # nss_wrapper
- "NSS_WRAPPER_PASSWD",
- "NSS_WRAPPER_GROUP",
- "NSS_WRAPPER_HOSTS",
- "NSS_WRAPPER_HOSTNAME",
- "NSS_WRAPPER_MODULE_SO_PATH",
- "NSS_WRAPPER_MODULE_FN_PREFIX",
-
- # resolv_wrapper
- "RESOLV_WRAPPER_CONF",
- "RESOLV_WRAPPER_HOSTS",
-);
-
sub sighandler($)
{
my $signame = shift;
@@ -920,9 +846,7 @@ sub setup_env($$)
# Initially clear out the environment for the provision, so previous envs'
# variables don't leak in. Provisioning steps must explicitly set their
# necessary variables when calling out to other executables
- foreach (@exported_envvars) {
- delete $ENV{$_};
- }
+ Samba::clear_exported_envvars();
delete $ENV{SOCKET_WRAPPER_DEFAULT_IFACE};
delete $ENV{SMB_CONF_PATH};
@@ -965,13 +889,8 @@ sub setup_env($$)
die("Unknown option[$option] for envname[$envname]");
}
- foreach (@exported_envvars) {
- if (defined($testenv_vars->{$_})) {
- $ENV{$_} = $testenv_vars->{$_};
- } else {
- delete $ENV{$_};
- }
- }
+ # export the environment variables for the testenv (SERVER, SERVER_IP, etc)
+ Samba::export_envvars($testenv_vars);
my $krb5_ccache_path = "${selftest_krbt_ccache_path}.${envname}.${option}";
unlink($krb5_ccache_path);
@@ -979,19 +898,6 @@ sub setup_env($$)
return $testenv_vars;
}
-sub exported_envvars_str($)
-{
- my ($testenv_vars) = @_;
- my $out = "";
-
- foreach (@exported_envvars) {
- next unless defined($testenv_vars->{$_});
- $out .= $_."=".$testenv_vars->{$_}."\n";
- }
-
- return $out;
-}
-
sub getlog_env($)
{
my ($envname) = @_;
@@ -1040,7 +946,7 @@ if ($opt_testenv) {
$ENV{PIDDIR} = $testenv_vars->{PIDDIR};
$ENV{ENVNAME} = $testenv_name;
- my $envvarstr = exported_envvars_str($testenv_vars);
+ my $envvarstr = Samba::exported_envvars_str($testenv_vars);
my @term_args = ("echo -e \"
Welcome to the Samba4 Test environment '$testenv_name'
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index 324e1bf..e13952c 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -532,4 +532,111 @@ sub random_domain_sid()
return $domain_sid;
}
+my @exported_envvars = (
+ # domain stuff
+ "DOMAIN",
+ "DNSNAME",
+ "REALM",
+ "DOMSID",
+
+ # stuff related to a trusted domain
+ "TRUST_SERVER",
+ "TRUST_USERNAME",
+ "TRUST_PASSWORD",
+ "TRUST_DOMAIN",
+ "TRUST_REALM",
+ "TRUST_DOMSID",
+
+ # domain controller stuff
+ "DC_SERVER",
+ "DC_SERVER_IP",
+ "DC_SERVER_IPV6",
+ "DC_NETBIOSNAME",
+ "DC_NETBIOSALIAS",
+
+ # server stuff
+ "SERVER",
+ "SERVER_IP",
+ "SERVER_IPV6",
+ "NETBIOSNAME",
+ "NETBIOSALIAS",
+ "SAMSID",
+
+ # only use these 2 as a last resort. Some tests need to test both client-
+ # side and server-side. In this case, run as default client, ans access
+ # server's smb.conf as needed, typically using:
+ # param.LoadParm(filename_for_non_global_lp=os.environ['SERVERCONFFILE'])
+ "SERVERCONFFILE",
+ "DC_SERVERCONFFILE",
+
+ # user stuff
+ "USERNAME",
+ "USERID",
+ "PASSWORD",
+ "DC_USERNAME",
+ "DC_PASSWORD",
+
+ # UID/GID for rfc2307 mapping tests
+ "UID_RFC2307TEST",
+ "GID_RFC2307TEST",
+
+ # misc stuff
+ "KRB5_CONFIG",
+ "KRB5CCNAME",
+ "SELFTEST_WINBINDD_SOCKET_DIR",
+ "NMBD_SOCKET_DIR",
+ "LOCAL_PATH",
+ "DNS_FORWARDER1",
+ "DNS_FORWARDER2",
+ "RESOLV_CONF",
+ "UNACCEPTABLE_PASSWORD",
+ "LOCK_DIR",
+ "SMBD_TEST_LOG",
+
+ # nss_wrapper
+ "NSS_WRAPPER_PASSWD",
+ "NSS_WRAPPER_GROUP",
+ "NSS_WRAPPER_HOSTS",
+ "NSS_WRAPPER_HOSTNAME",
+ "NSS_WRAPPER_MODULE_SO_PATH",
+ "NSS_WRAPPER_MODULE_FN_PREFIX",
+
+ # resolv_wrapper
+ "RESOLV_WRAPPER_CONF",
+ "RESOLV_WRAPPER_HOSTS",
+);
+
+sub exported_envvars_str
+{
+ my ($testenv_vars) = @_;
+ my $out = "";
+
+ foreach (@exported_envvars) {
+ next unless defined($testenv_vars->{$_});
+ $out .= $_."=".$testenv_vars->{$_}."\n";
+ }
+
+ return $out;
+}
+
+sub clear_exported_envvars
+{
+ foreach (@exported_envvars) {
+ delete $ENV{$_};
+ }
+}
+
+sub export_envvars
+{
+ my ($testenv_vars) = @_;
+
+ foreach (@exported_envvars) {
+ if (defined($testenv_vars->{$_})) {
+ $ENV{$_} = $testenv_vars->{$_};
+ } else {
+ delete $ENV{$_};
+ }
+ }
+}
+
1;
--
2.7.4
From ef3f5f291309b2b884b1b2abd1cc9db700b527c7 Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
Date: Tue, 26 Feb 2019 15:52:28 +1300
Subject: [PATCH 3/6] selftest: Add helper function to create exports file for
a testenv
This writes out the environment variables that are normally setup in the
testenv xterm to a file. This allows them to be sourced later.
This function is currently unused. However, it provides an alternative
replacement for the selftest-vars.sh script (which is really out of
date). I do plan to make use of this function in a subsequent patch-set.
Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
---
selftest/target/Samba.pm | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index e13952c..3a23862 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -639,4 +639,14 @@ sub export_envvars
}
}
+sub export_envvars_to_file
+{
+ my ($filepath, $testenv_vars) = @_;
+ my $env_str = exported_envvars_str($testenv_vars);
+
+ open(FILE, "> $filepath");
+ print FILE "$env_str";
+ close(FILE);
+}
+
1;
--
2.7.4
From 73fc62da49eef102c54c3b2892f3bbcd48cfe988 Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
Date: Mon, 11 Mar 2019 15:37:45 +1300
Subject: [PATCH 4/6] s4/scripting: Remove legacy selftest-vars.sh script
This script was added in 2010 and has only been sporadically kept
up-to-date since. It doesn't appear to work (I think that selftest
and the testenvs have perhaps grown in complexity since 2010 and it's no
longer possible to try to access a testenv from a different
process-space, due to how we use the cwrap libraries).
There's now an alternative (export_envvars_to_file()) in the selftest
code to regenerate a similar file, if anyone actually needs it.
Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
---
source4/scripting/devel/selftest-vars.sh | 36 --------------------------------
1 file changed, 36 deletions(-)
delete mode 100644 source4/scripting/devel/selftest-vars.sh
diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
deleted file mode 100644
index 5d532f2..0000000
--- a/source4/scripting/devel/selftest-vars.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-# . these into your shell to allow you to run with socketwrapper
-# outside the test environment
-
-export UID_WRAPPER=1
-export NSS_WRAPPER_PASSWD=$PWD/st/ad_dc_ntvfs/passwd
-export NSS_WRAPPER_GROUP=$PWD/st/ad_dc_ntvfs/group
-export CONFIGURATION="--configfile=$PWD/st/ad_dc_ntvfs/etc/smb.conf"
-export SELFTEST_MAXTIME=1200
-export NETBIOSNAME=localdc1
-export REALM=SAMBA.EXAMPLE.COM
-export SOCKET_WRAPPER_DEFAULT_IFACE=21
-export SERVER=localdc1
-export SELFTEST_WINBINDD_SOCKET_DIR=$PWD/st/ad_dc_ntvfs/winbindd_socket
-export SELFTEST_PREFIX=$PWD/st
-export DOMAIN=SAMBADOMAIN
-export BINDIR=./bin
-export DC_SERVER_IP=127.0.0.21
-export SOCKET_WRAPPER_DIR=$PWD/st/w
-export DC_USERNAME=Administrator
-export USERNAME=Administrator
-export SERVER_IP=127.0.0.21
-export KRB5_CONFIG=$PWD/st/ad_dc_ntvfs/etc/krb5.conf
-export PREFIX_ABS=$PWD/st
-export SRCDIR_ABS=$PWD
-export PREFIX=$PWD/st
-export KRB5CCNAME=$PWD/st/krb5ticket
-export SRCDIR=$PWD/
-export TLS_ENABLED=yes
-export DC_NETBIOSALIAS=localdc
-export DC_NETBIOSNAME=localdc1
-export DC_SERVER=localdc1
-export DC_PASSWORD=locDCpass1
-export PYTHONPATH=$PWD/bin/python
-export PASSWORD=locDCpass1
-export NETBIOSALIAS=localdc
-export SMB_CONF_PATH=$PWD/st/ad_dc_ntvfs/etc/smb.conf
--
2.7.4
From 208255e2ebfdec827eb1b2e3272dce8e0534326d Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
Date: Mon, 11 Mar 2019 16:28:16 +1300
Subject: [PATCH 5/6] selftest: Remove RUN_FROM_BUILD_FARM env variable
The build farm is no longer used, so we can remove checks for this
environment variable in the selftest code.
Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
---
selftest/wscript | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/selftest/wscript b/selftest/wscript
index 727adcf..7d8300f 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -185,8 +185,6 @@ def cmd_testonly(opt):
if Options.options.PERF_TEST:
env.FILTER_OPTIONS = ('${PYTHON} -u ${srcdir}/selftest/filter-subunit '
'--perf-test-output')
- elif os.environ.get('RUN_FROM_BUILD_FARM') is not None:
- env.FILTER_OPTIONS = '${FILTER_XFAIL} --strip-passed-output'
else:
env.FILTER_OPTIONS = '${FILTER_XFAIL}'
@@ -314,8 +312,7 @@ def cmd_testonly(opt):
# Skip subunit filtering (i.e. because python is disabled).
# Use --one to bail out upon any failure
cmd = '(${CORE_COMMAND} --one && touch ${SELFTEST_PREFIX}/st_done)'
- elif (os.environ.get('RUN_FROM_BUILD_FARM') is None and
- not Options.options.FILTERED_SUBUNIT):
+ elif not Options.options.FILTERED_SUBUNIT:
subunit_cache = os.path.join(env.SELFTEST_PREFIX, "subunit")
cmd += ' | tee %s | ${FORMAT_TEST_OUTPUT}' % subunit_cache
else:
--
2.7.4
From 8effa8624262a1c813adb9a95be24fc3730960f3 Mon Sep 17 00:00:00 2001
From: Tim Beale <timbeale at catalyst.net.nz>
Date: Mon, 11 Mar 2019 16:03:34 +1300
Subject: [PATCH 6/6] testsuite: Remove build_farm testsuites
This test code is not run (and has not been run for about a decade).
Let's remove it - it's there in the git history if we ever want to try
to repurpose it again.
Signed-off-by: Tim Beale <timbeale at catalyst.net.nz>
---
source4/selftest/win/README | 49 -----
testsuite/README | 4 +-
testsuite/build_farm/backtrace | 15 --
testsuite/build_farm/basicsmb-domainsec-nt4.test | 28 ---
testsuite/build_farm/basicsmb-domainsec.test | 27 ---
testsuite/build_farm/basicsmb-hostsdeny.test | 18 --
testsuite/build_farm/basicsmb-hostsequiv.test | 26 ---
testsuite/build_farm/basicsmb-invalidusers.test | 10 -
.../build_farm/basicsmb-local-pass-change.test | 10 -
testsuite/build_farm/basicsmb-preexec.test | 28 ---
.../build_farm/basicsmb-remote-pass-change.test | 10 -
testsuite/build_farm/basicsmb-serversec.test | 9 -
testsuite/build_farm/basicsmb-shareguest.test | 20 --
testsuite/build_farm/basicsmb-sharelist.test | 22 ---
testsuite/build_farm/basicsmb-sharesec.test | 9 -
testsuite/build_farm/basicsmb-usersec.test | 9 -
testsuite/build_farm/basicsmb.fns | 202 ---------------------
testsuite/build_farm/runlist | 18 --
testsuite/build_farm/template/basicsmb.smb.conf | 49 -----
.../build_farm/template/basicsmb.smb.conf.domain | 2 -
.../template/basicsmb.smb.conf.hostsdeny | 1 -
.../template/basicsmb.smb.conf.hostsequiv | 3 -
.../template/basicsmb.smb.conf.invalidusers | 1 -
.../build_farm/template/basicsmb.smb.conf.preexec | 1 -
.../template/basicsmb.smb.conf.preexec_cl_fl | 2 -
.../template/basicsmb.smb.conf.preexec_close | 2 -
.../build_farm/template/basicsmb.smb.conf.server | 3 -
.../build_farm/template/basicsmb.smb.conf.share | 1 -
.../build_farm/template/basicsmb.smb.conf.user | 1 -
.../template/basicsmb.smb.conf.validusers | 1 -
testsuite/build_farm/template/preexec | 3 -
testsuite/build_farm/torture-ATTR.test | 2 -
testsuite/build_farm/torture-BROWSE.test | 2 -
testsuite/build_farm/torture-DELETE.test | 2 -
testsuite/build_farm/torture-DENY1.test | 2 -
testsuite/build_farm/torture-DENY2.test | 2 -
testsuite/build_farm/torture-DIR.test | 2 -
testsuite/build_farm/torture-DIR1.test | 2 -
testsuite/build_farm/torture-FDPASS.test | 2 -
testsuite/build_farm/torture-FDSESS.test | 2 -
testsuite/build_farm/torture-LOCK1.test | 2 -
testsuite/build_farm/torture-LOCK2.test | 2 -
testsuite/build_farm/torture-LOCK3.test | 2 -
testsuite/build_farm/torture-LOCK4.test | 2 -
testsuite/build_farm/torture-LOCK5.test | 2 -
testsuite/build_farm/torture-LOCK6.test | 2 -
testsuite/build_farm/torture-LOCK7.test | 2 -
testsuite/build_farm/torture-MANGLE.test | 2 -
testsuite/build_farm/torture-OPEN.test | 2 -
testsuite/build_farm/torture-OPLOCK1.test | 2 -
testsuite/build_farm/torture-PROPERTIES.test | 2 -
testsuite/build_farm/torture-RANDOMIPC.test | 2 -
testsuite/build_farm/torture-RENAME.test | 2 -
testsuite/build_farm/torture-RW1.test | 2 -
testsuite/build_farm/torture-RW2.test | 2 -
testsuite/build_farm/torture-TCON.test | 2 -
testsuite/build_farm/torture-TCON1.test | 2 -
testsuite/build_farm/torture-TCON2.test | 2 -
testsuite/build_farm/torture-TCONDEV.test | 2 -
testsuite/build_farm/torture-TORTURE.test | 2 -
testsuite/build_farm/torture-TRANS2.test | 2 -
testsuite/build_farm/torture-UNLINK.test | 2 -
testsuite/build_farm/torture-XCOPY.test | 2 -
testsuite/build_farm/torture_setup.fns | 19 --
64 files changed, 1 insertion(+), 666 deletions(-)
delete mode 100755 testsuite/build_farm/backtrace
delete mode 100644 testsuite/build_farm/basicsmb-domainsec-nt4.test
delete mode 100644 testsuite/build_farm/basicsmb-domainsec.test
delete mode 100644 testsuite/build_farm/basicsmb-hostsdeny.test
delete mode 100644 testsuite/build_farm/basicsmb-hostsequiv.test
delete mode 100644 testsuite/build_farm/basicsmb-invalidusers.test
delete mode 100644 testsuite/build_farm/basicsmb-local-pass-change.test
delete mode 100644 testsuite/build_farm/basicsmb-preexec.test
delete mode 100644 testsuite/build_farm/basicsmb-remote-pass-change.test
delete mode 100644 testsuite/build_farm/basicsmb-serversec.test
delete mode 100644 testsuite/build_farm/basicsmb-shareguest.test
delete mode 100644 testsuite/build_farm/basicsmb-sharelist.test
delete mode 100644 testsuite/build_farm/basicsmb-sharesec.test
delete mode 100644 testsuite/build_farm/basicsmb-usersec.test
delete mode 100644 testsuite/build_farm/basicsmb.fns
delete mode 100644 testsuite/build_farm/runlist
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.domain
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.invalidusers
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.preexec
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.preexec_close
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.server
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.share
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.user
delete mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.validusers
delete mode 100644 testsuite/build_farm/template/preexec
delete mode 100644 testsuite/build_farm/torture-ATTR.test
delete mode 100644 testsuite/build_farm/torture-BROWSE.test
delete mode 100644 testsuite/build_farm/torture-DELETE.test
delete mode 100644 testsuite/build_farm/torture-DENY1.test
delete mode 100644 testsuite/build_farm/torture-DENY2.test
delete mode 100644 testsuite/build_farm/torture-DIR.test
delete mode 100644 testsuite/build_farm/torture-DIR1.test
delete mode 100644 testsuite/build_farm/torture-FDPASS.test
delete mode 100644 testsuite/build_farm/torture-FDSESS.test
delete mode 100644 testsuite/build_farm/torture-LOCK1.test
delete mode 100644 testsuite/build_farm/torture-LOCK2.test
delete mode 100644 testsuite/build_farm/torture-LOCK3.test
delete mode 100644 testsuite/build_farm/torture-LOCK4.test
delete mode 100644 testsuite/build_farm/torture-LOCK5.test
delete mode 100644 testsuite/build_farm/torture-LOCK6.test
delete mode 100644 testsuite/build_farm/torture-LOCK7.test
delete mode 100644 testsuite/build_farm/torture-MANGLE.test
delete mode 100644 testsuite/build_farm/torture-OPEN.test
delete mode 100644 testsuite/build_farm/torture-OPLOCK1.test
delete mode 100644 testsuite/build_farm/torture-PROPERTIES.test
delete mode 100644 testsuite/build_farm/torture-RANDOMIPC.test
delete mode 100644 testsuite/build_farm/torture-RENAME.test
delete mode 100644 testsuite/build_farm/torture-RW1.test
delete mode 100644 testsuite/build_farm/torture-RW2.test
delete mode 100644 testsuite/build_farm/torture-TCON.test
delete mode 100644 testsuite/build_farm/torture-TCON1.test
delete mode 100644 testsuite/build_farm/torture-TCON2.test
delete mode 100644 testsuite/build_farm/torture-TCONDEV.test
delete mode 100644 testsuite/build_farm/torture-TORTURE.test
delete mode 100644 testsuite/build_farm/torture-TRANS2.test
delete mode 100644 testsuite/build_farm/torture-UNLINK.test
delete mode 100644 testsuite/build_farm/torture-XCOPY.test
delete mode 100644 testsuite/build_farm/torture_setup.fns
diff --git a/source4/selftest/win/README b/source4/selftest/win/README
index fc93438..f6e716c 100644
--- a/source4/selftest/win/README
+++ b/source4/selftest/win/README
@@ -70,52 +70,3 @@ remotely administered with telnet. Specifically, this will allow us to use
'make wintest' in Samba 4 to perform smbtorture tests against a Windows host,
and perform tests from a Windows client to a Samba server.
-INTEGRATING WITH THE BUILD FARM
-
-Follow the standard steps to add a host to the build farm. The major
-difference is that we will need to run these tests as root. To run the
-Windows tests in the build farm, a .fns file will need to be created for
-your new host that exports a WINTESTCONF environment variable pointing to a
-config file used by 'make wintest'. An example of this config file can be
-found at source/selftest/win/test_win.conf in the Samba 4 source tree.
-
-I've also included the bnhtest.fns file that I'm using for my build farm host
-below, as an example. It was modified from generic.fns.
-
-action_test_windows() {
- do_make wintest
- w_status=$?
- echo "WINTEST STATUS: $w_status"
- return $w_status;
-}
-
-per_run_hook
-
-system=`uname`
-
-export WINTESTCONF="/home/build/win/test_win.conf"
-
-for compiler in gcc cc icc; do
-
- # arrgh, "which" gives no err code on solaris
- path=`which $compiler`
- if [ -x "$path" ]; then
-
- if $compiler -v 2>&1 | grep gcc.version > /dev/null; then
- isgcc=1
- CFLAGS="-Wall"
- export CFLAGS
- else
- CFLAGS=""
- export CFLAGS
- isgcc=0
- fi
- if [ $compiler = gcc -o $isgcc = 0 ]; then
-
- # only attempt samba4 if we have perl
- if which perl > /dev/null; then
- test_tree samba4 source $compiler configure build install test_windows test
- fi
- fi
- fi
-done
diff --git a/testsuite/README b/testsuite/README
index 5ca207f..e04a783 100644
--- a/testsuite/README
+++ b/testsuite/README
@@ -7,9 +7,7 @@ The Samba testsuite is divided up into the following subdirectories.
- nsswitch Tests for nsswitch extensions
- - build_farm Tests designed to run automatically on the build farm
-
-All the scripts except those in build_farm require an unreleased
+All the scripts require an unreleased
version of DejaGNU, and although they contain some useful tests they
are not so useful at the moment. All scripts are migrating to a
single test framework, Satyr. <cvs://cvs.samba.org/data/cvs/satyr>
diff --git a/testsuite/build_farm/backtrace b/testsuite/build_farm/backtrace
deleted file mode 100755
index efaa9f2..0000000
--- a/testsuite/build_farm/backtrace
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Modified version of tridge's backtrace script.
-# we want everything on stderr, so the program is not disturbed
-exec 1>&2
-
-PID=$1
-TMPFILE=$prefix/backtrace.$$
-cat << EOF > $TMPFILE
-set height 0
-up 8
-bt full
-quit
-EOF
-gdb -x $TMPFILE $prefix/sbin/smbd $PID
-/bin/rm -f $TMPFILE
diff --git a/testsuite/build_farm/basicsmb-domainsec-nt4.test b/testsuite/build_farm/basicsmb-domainsec-nt4.test
deleted file mode 100644
index 4e68aca..0000000
--- a/testsuite/build_farm/basicsmb-domainsec-nt4.test
+++ /dev/null
@@ -1,28 +0,0 @@
-. basicsmb.fns
-
-test_joindomain_nt4() {
-
- echo $prefix/bin/smbpasswd -L -a -m buildfarm$
- $prefix/bin/smbpasswd -L -a -m buildfarm$
-
- echo $prefix/bin/net rpc oldjoin -S localhost
- $prefix/bin/net rpc oldjoin -S localhost
- status=$?
- if [ $status = 0 ]; then
- echo "'net rpc oldjoin' correctly joined the domain"
- else
- echo "'net rpc oldjoin' failed to join the domain! (status $status)"
- return 1
- fi
- return 0
-}
-
-password=samba
-security=DOMAIN
-(test_smb_conf_setup && test_smbpasswd $password ) || exit 1
-
-test_joindomain_nt4 $password || exit 1
-
-test_listfilesauth $security || exit 1
-test_listfilesnpw $security || exit 1
-
diff --git a/testsuite/build_farm/basicsmb-domainsec.test b/testsuite/build_farm/basicsmb-domainsec.test
deleted file mode 100644
index eb0a5c8..0000000
--- a/testsuite/build_farm/basicsmb-domainsec.test
+++ /dev/null
@@ -1,27 +0,0 @@
-
-. basicsmb.fns
-
-test_joindomain() {
- test_join_domain_password="$1"
-
- 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"
- else
- echo "'net rpc join' failed to join the domain! (status $status)"
- return 1
- fi
- return 0
-}
-
-password=samba
-(test_smb_conf_setup && test_smbpasswd $password ) || exit 1
-
-test_joindomain $password || exit 1
-
-security=DOMAIN
-test_listfilesauth $security || exit 1
-test_listfilesnpw $security || exit 1
-
diff --git a/testsuite/build_farm/basicsmb-hostsdeny.test b/testsuite/build_farm/basicsmb-hostsdeny.test
deleted file mode 100644
index c7f6bec..0000000
--- a/testsuite/build_farm/basicsmb-hostsdeny.test
+++ /dev/null
@@ -1,18 +0,0 @@
-. basicsmb.fns
-
-password="samba"
-security="hostsdeny"
-(test_smb_conf_setup && test_smbpasswd $password) || exit 1
-
-(test_listfilesauth_should_deny $security) || exit 1
-
-
-
-
-
-
-
-
-
-
-
diff --git a/testsuite/build_farm/basicsmb-hostsequiv.test b/testsuite/build_farm/basicsmb-hostsequiv.test
deleted file mode 100644
index d424743..0000000
--- a/testsuite/build_farm/basicsmb-hostsequiv.test
+++ /dev/null
@@ -1,26 +0,0 @@
-if [ $whoami = "root" ]; then
- exit 0;
-fi
-
-. basicsmb.fns
-
-test_listfilesrootnpw() {
- remote_name="$1"
- echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -Uroot% -c 'ls'
- $prefix/bin/smbclient //$remote_name/samba -n buildclient -Uroot% -c 'ls'
- status=$?
- if [ $status = 0 ]; then
- echo "smbd listed files AS ROOT with NO PASSWORD (hosts equiv test)!"
- return 1
- else
- echo "listing files with smbd failed with status $status (correct)"
- fi
- return 0
-}
-
-password="not-a-valid-password"
-security="hostsequiv"
-(test_smb_conf_setup ) || exit 1
-
-(test_listfilesauth $security) || exit 1
-(test_listfilesrootnpw $security) || exit 1
diff --git a/testsuite/build_farm/basicsmb-invalidusers.test b/testsuite/build_farm/basicsmb-invalidusers.test
deleted file mode 100644
index 7d67cc2..0000000
--- a/testsuite/build_farm/basicsmb-invalidusers.test
+++ /dev/null
@@ -1,10 +0,0 @@
-. basicsmb.fns
-
-password="samba"
-security="invalidusers"
-(test_smb_conf_setup && test_smbpasswd $password) || exit 1
-
-(test_listfilesauth_should_deny $security) || exit 1
-
-security="validusers"
-(test_listfilesauth $security) || exit 1
diff --git a/testsuite/build_farm/basicsmb-local-pass-change.test b/testsuite/build_farm/basicsmb-local-pass-change.test
deleted file mode 100644
index 432376c..0000000
--- a/testsuite/build_farm/basicsmb-local-pass-change.test
+++ /dev/null
@@ -1,10 +0,0 @@
-. basicsmb.fns
-
-passwordold=samba
-password=samba2
-security=USER
-(test_smb_conf_setup && test_smbpasswd $passwordold && test_smbpasswd_local $passwordold $password) || exit 1
-
-test_listfilesauth $security || exit 1
-test_listfilesnpw $security || exit 1
-
diff --git a/testsuite/build_farm/basicsmb-preexec.test b/testsuite/build_farm/basicsmb-preexec.test
deleted file mode 100644
index fc072e5..0000000
--- a/testsuite/build_farm/basicsmb-preexec.test
+++ /dev/null
@@ -1,28 +0,0 @@
-. basicsmb.fns
-
-password=samba
-(test_smb_conf_setup && test_smbpasswd $password ) || exit 1
-
-rm -f $prefix/testdir/preexec_touch
-
-mode=PREEXEC
-(test_listfilesauth $mode) || exit 1
-
-if [ -f $prefix/testdir/preexec_touch ]; then
- rm -f $prefix/testdir/preexec_touch
-else
- exit 1;
-fi
-
-mode=PREEXEC_close
-(test_listfilesauth $mode) || exit 1
-
-if [ -f $prefix/testdir/preexec_touch ]; then
- rm -f $prefix/testdir/preexec_touch
-else
- exit 1;
-fi
-
-mode=PREEXEC_cl_fl
-(test_listfilesauth_should_deny $mode) || exit 1
-
diff --git a/testsuite/build_farm/basicsmb-remote-pass-change.test b/testsuite/build_farm/basicsmb-remote-pass-change.test
deleted file mode 100644
index adfe0dc..0000000
--- a/testsuite/build_farm/basicsmb-remote-pass-change.test
+++ /dev/null
@@ -1,10 +0,0 @@
-. basicsmb.fns
-
-passwordold=samba
-password=samba2
-security=USER
-(test_smb_conf_setup && test_smbpasswd $passwordold && test_smbpasswd_remote $passwordold $password) || exit 1
-
-test_listfilesauth $security || exit 1
-test_listfilesnpw $security || exit 1
-
diff --git a/testsuite/build_farm/basicsmb-serversec.test b/testsuite/build_farm/basicsmb-serversec.test
deleted file mode 100644
index b45899a..0000000
--- a/testsuite/build_farm/basicsmb-serversec.test
+++ /dev/null
@@ -1,9 +0,0 @@
-. basicsmb.fns
-
-password=samba
-security=SERVER
-(test_smb_conf_setup && test_smbpasswd $password ) || exit 1
-
-test_listfilesauth $security || exit 1
-test_listfilesnpw $security || exit 1
-
diff --git a/testsuite/build_farm/basicsmb-shareguest.test b/testsuite/build_farm/basicsmb-shareguest.test
deleted file mode 100644
index 4ba445a..0000000
--- a/testsuite/build_farm/basicsmb-shareguest.test
+++ /dev/null
@@ -1,20 +0,0 @@
-. basicsmb.fns
-
-test_listfilesguestshare() {
- remote_name=$1
- echo $prefix/bin/smbclient //$remote_name/guest_share -n buildclient -U$whoami% -c 'ls'
- $prefix/bin/smbclient //$remote_name/guest_share -n buildclient -U$whoami% -c 'ls'
- status=$?
- if [ $status = 0 ]; then
- echo "smbd listed files correctly (guest share)"
- else
- echo "listing files on a guest share failed with status $status"
- return 1
- fi
- return 0
-}
-
-security=SHARE
-( test_smb_conf_setup ) || exit 1
-
-( test_listfilesguestshare $security ) || exit 1
\ No newline at end of file
diff --git a/testsuite/build_farm/basicsmb-sharelist.test b/testsuite/build_farm/basicsmb-sharelist.test
deleted file mode 100644
index 188e985..0000000
--- a/testsuite/build_farm/basicsmb-sharelist.test
+++ /dev/null
@@ -1,22 +0,0 @@
-. basicsmb.fns
-test_sharelist() {
- echo $prefix/bin/smbclient -U$whoami% -L localhost
- $prefix/bin/smbclient -U$whoami% -L localhost
- status=$?
- if [ $status = 0 ]; then
- echo "smbd listed shares OK"
- else
- echo "listing shares with smbd failed with status $status"
- return 1
- fi
- return 0
-}
-
-# Need guest account
-password=samba
-security=USER
-(test_smb_conf_setup && test_smbpasswd $password ) || exit 1
-
-test_sharelist || exit 1
-
-
diff --git a/testsuite/build_farm/basicsmb-sharesec.test b/testsuite/build_farm/basicsmb-sharesec.test
deleted file mode 100644
index edef6a9..0000000
--- a/testsuite/build_farm/basicsmb-sharesec.test
+++ /dev/null
@@ -1,9 +0,0 @@
-. basicsmb.fns
-
-password="samba"
-security="SHARE"
-(test_smb_conf_setup && ( test_smbpasswd $password ) ) || exit 1
-
-(test_listfilesauth $security) || exit 1
-(test_listfilesnpw $security) || exit 1
-
diff --git a/testsuite/build_farm/basicsmb-usersec.test b/testsuite/build_farm/basicsmb-usersec.test
deleted file mode 100644
index 06f2a1c..0000000
--- a/testsuite/build_farm/basicsmb-usersec.test
+++ /dev/null
@@ -1,9 +0,0 @@
-. basicsmb.fns
-
-password=samba
-security=USER
-(test_smb_conf_setup && test_smbpasswd $password ) || exit 1
-
-test_listfilesauth $security || exit 1
-test_listfilesnpw $security || exit 1
-
diff --git a/testsuite/build_farm/basicsmb.fns b/testsuite/build_farm/basicsmb.fns
deleted file mode 100644
index d1127e8..0000000
--- a/testsuite/build_farm/basicsmb.fns
+++ /dev/null
@@ -1,202 +0,0 @@
-#! /bin/sh
-
-# Common functions for Samba build scripts.
-
-# Copyright (C) 2001 by Martin Pool <mbp at samba.org> and others
-
-# The following variables are passed in by the calling script. They
-# originate in either the buildfarm scripts or the configured
-# Makefile.
-
-# PREFIX = Installed prefix of samba test installation. Used to
-# locate binaries, configuration files, etc.
-
-# XXX: It's pretty bad to clobber the installed configuration file and
-# other data in $prefix, because somebody might unwittingly run this
-# with prefix=/usr.
-
-# Really what we want is a consistent way to pass the location of the
-# configuration and all other files into *all* Samba programs
-# (smbclient, smd, ...) and be able to set them to a temporary
-# directory when testing. Some of them take a -c parameter, but tpot
-# says it's not done consistently.
-
-template_setup() {
- cat template/$1 | \
- sed "s|PREFIX|$prefix|g" | \
- sed "s|BUILD_FARM|$test_root|g" | \
- sed "s|WHOAMI|$whoami|g" | \
- sed "s|LOGLEVEL|$loglevel|g" \
- > $prefix/$2
- echo "template_setup: Created $prefix/$2"
-}
-
-template_smb_conf_setup() {
- template_setup "basicsmb.smb.conf$1" "lib/smb.conf$1"
-}
-
-test_smb_conf_setup() {
- echo "test_smb_conf_setup: Configuring: "
- echo " PREFIX=$prefix"
- echo " BUILD_FARM=$test_root"
- echo " WHOAMI=$whoami"
- echo " LOGLEVEL=$loglevel"
- echo " TREE=$tree"
-
- case "$prefix" in
- /usr*|/|//)
- echo "** I don't want to clobber your installation in "
- echo "** $prefix"
- echo "** by running tests there. Please reconfigure this source tree to"
- echo "** use a different prefix."
- 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_fl
-
- template_smb_conf_setup .share
- template_smb_conf_setup .user
- template_smb_conf_setup .server
- template_smb_conf_setup .domain
-
- template_setup preexec lib/preexec
-
- touch $prefix/lib/smb.conf.
- touch $prefix/lib/smb.conf.localhost
-
- echo "127.0.0.1 localhost">$prefix/lib/lmhosts
- echo "127.0.0.2 BUILDFARM">>$prefix/lib/lmhosts
- echo "127.0.0.3 SHARE">>$prefix/lib/lmhosts
- echo "127.0.0.4 USER">>$prefix/lib/lmhosts
- echo "127.0.0.5 SERVER">>$prefix/lib/lmhosts
- echo "127.0.0.6 DOMAIN">>$prefix/lib/lmhosts
- echo "127.0.0.7 HOSTSEQUIV">>$prefix/lib/lmhosts
- echo "127.0.0.7 VALIDUSERS">>$prefix/lib/lmhosts
- echo "127.0.0.7 INVALIDUSERS">>$prefix/lib/lmhosts
- echo "127.0.0.7 PREEXEC">>$prefix/lib/lmhosts
- echo "127.0.0.7 PREEXEC_CLOSE">>$prefix/lib/lmhosts
- echo "127.0.0.7 PREEXEC_CL_FL">>$prefix/lib/lmhosts
-
-
- echo "127.0.0.1" > $prefix/lib/hosts.equiv
-
-}
-
-test_smbpasswd() {
- test_smbpasswd_password="$1"
- rm -f $prefix/private/smbpasswd
- echo "( echo $test_smbpasswd_password ; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -D $loglevel -s -a $whoami"
- ( echo $test_smbpasswd_password; echo $test_smbpasswd_password; ) | $prefix/bin/smbpasswd -L -D $loglevel -s -a $whoami
- status=$?
- if [ $status = 0 ]; then
- echo "smbpasswd correctly set initial password ($test_smbpasswd_password)"
- else
- echo "smbpasswd failed to set initial password ($test_smbpasswd_password)! (status $status)"
- return 1
- fi
- return 0
-}
-
-test_smbpasswd_remote() {
- test_smbpasswd_rem_password="$1"
- test_smbpasswd_rem_newpassword="$2"
- echo "( echo $test_smbpasswd_rem_password; echo $test_smbpasswd_rem_newpassword; echo $test_smbpasswd_rem_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami"
- ( echo $test_smbpasswd_rem_password; echo $test_smbpasswd_rem_newpassword; echo $test_smbpasswd_rem_newpassword; ) | $prefix/bin/smbpasswd -r localhost -s -U $whoami
- status=$?
- if [ $status = 0 ]; then
- echo "smbpasswd correctly remotely changed password ($test_smbpasswd_rem_password -> $test_smbpasswd_rem_newpassword)"
- else
- echo "smbpasswd failed to remotely changed password ($test_smbpasswd_rem_password -> $test_smbpasswd_rem_newpassword)! (status $status)"
- return 1
- fi
- return 0
-}
-
-test_smbpasswd_local() {
- test_smbpasswd_newpassword="$2"
- echo "( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L -s $whoami"
- ( echo $test_smbpasswd_newpassword ; echo $test_smbpasswd_newpassword; ) | $prefix/bin/smbpasswd -L -s $whoami
- status=$?
- if [ $status = 0 ]; then
- echo "smbpasswd correctly locally changed password ($test_smbpasswd_password -> $test_smbpasswd_newpassword)"
- else
- echo "smbpasswd failed to locallly changed password ($test_smbpasswd_password -> $test_smbpasswd_newpassword)! (status $status)"
- return 1
- fi
- return 0
-}
-
-test_listfilesauth() {
- remote_name="$1"
- echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls'
- $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls'
- status=$?
- if [ $status = 0 ]; then
- echo "listed files OK"
- else
- echo "listing files with smbd failed with status $status"
- return 1
- fi
- return 0
-}
-
-test_listfilesnpw() {
- remote_name="$1"
- echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami% -c 'ls'
- $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami% -c 'ls'
- status=$?
- if [ $status = 0 ]; then
- echo "smbd listed files with NO PASSWORD on an authenticated share!"
- return 1
- else
- echo "listing files with smbd failed with status $status (correct)"
- fi
- return 0
-}
-
-test_listfilesauth_should_deny() {
- remote_name="$1"
- echo $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls'
- $prefix/bin/smbclient //$remote_name/samba -n buildclient -U$whoami%$password -c 'ls'
- status=$?
- if [ $status = 0 ]; then
- echo "smbd LISTED FILES despite smb.conf entires to the contary!"
- return 1
- else
- echo "listing files with smbd failed with status $status (correct)"
- fi
- return 0
-}
-
-
-
-# Give sensible defaults to some variables.
-
-# "What's my age again?"
-
-if [ ! $USER = "" ]; then
- whoami=$USER
-else
- if [ ! $LOGNAME = "" ]; then
- whoami=$LOGNAME
- else
- whoami=build
- fi
-fi
-
-
-
-if test -z "$loglevel"
-then
- loglevel=1
-fi
-
diff --git a/testsuite/build_farm/runlist b/testsuite/build_farm/runlist
deleted file mode 100644
index f9456b7..0000000
--- a/testsuite/build_farm/runlist
+++ /dev/null
@@ -1,18 +0,0 @@
-TEST_ALL="basicsmb-sharelist basicsmb-local-pass-change \
-basicsmb-sharesec basicsmb-usersec \
-basicsmb-serversec \
-basicsmb-shareguest basicsmb-hostsequiv basicsmb-invalidusers \
-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-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-domainsec basicsmb-domainsec-nt4
\ No newline at end of file
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf b/testsuite/build_farm/template/basicsmb.smb.conf
deleted file mode 100644
index 6cad714..0000000
--- 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
-
- idmap uid = 10000-200000
- map hidden = yes
- create mask = 0777
-
-[test]
- path = PREFIX/testdir
- read only = no
-
-[samba]
- path = BUILD_FARM/samba_3_0
- 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/template/basicsmb.smb.conf.domain b/testsuite/build_farm/template/basicsmb.smb.conf.domain
deleted file mode 100644
index 8b97288..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.domain
+++ /dev/null
@@ -1,2 +0,0 @@
-security=domain
-password server=user
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny b/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny
deleted file mode 100644
index 3fce0bd..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny
+++ /dev/null
@@ -1 +0,0 @@
- hosts deny = 127.
\ No newline at end of file
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv b/testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv
deleted file mode 100644
index 750af74..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.hostsequiv
+++ /dev/null
@@ -1,3 +0,0 @@
- hostname lookups = no
- hosts equiv=PREFIX/lib/hosts.equiv
- auth methods = hostsequiv
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.invalidusers b/testsuite/build_farm/template/basicsmb.smb.conf.invalidusers
deleted file mode 100644
index a96a316..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.invalidusers
+++ /dev/null
@@ -1 +0,0 @@
- invalid users = WHOAMI
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.preexec b/testsuite/build_farm/template/basicsmb.smb.conf.preexec
deleted file mode 100644
index cc34872..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.preexec
+++ /dev/null
@@ -1 +0,0 @@
-preexec = /bin/sh PREFIX/lib/preexec
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl b/testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl
deleted file mode 100644
index 4a6fae5..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_cl_fl
+++ /dev/null
@@ -1,2 +0,0 @@
-preexec close = yes
-preexec = PREFIX/lib/preexec_does_not_exist
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_close b/testsuite/build_farm/template/basicsmb.smb.conf.preexec_close
deleted file mode 100644
index 3aac699..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.preexec_close
+++ /dev/null
@@ -1,2 +0,0 @@
-preexec close = yes
-preexec = /bin/sh PREFIX/lib/preexec
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.server b/testsuite/build_farm/template/basicsmb.smb.conf.server
deleted file mode 100644
index 016f84c..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.server
+++ /dev/null
@@ -1,3 +0,0 @@
-security=server
-password server=user
-smb passwd file=NON_EXISTANT_FILE
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.share b/testsuite/build_farm/template/basicsmb.smb.conf.share
deleted file mode 100644
index 8e69cc1..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.share
+++ /dev/null
@@ -1 +0,0 @@
- security = share
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.user b/testsuite/build_farm/template/basicsmb.smb.conf.user
deleted file mode 100644
index 9d294b9..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.user
+++ /dev/null
@@ -1 +0,0 @@
- security = user
diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.validusers b/testsuite/build_farm/template/basicsmb.smb.conf.validusers
deleted file mode 100644
index d4a85e0..0000000
--- a/testsuite/build_farm/template/basicsmb.smb.conf.validusers
+++ /dev/null
@@ -1 +0,0 @@
- valid users = WHOAMI
diff --git a/testsuite/build_farm/template/preexec b/testsuite/build_farm/template/preexec
deleted file mode 100644
index 23809aa..0000000
--- a/testsuite/build_farm/template/preexec
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "Test worked" > PREFIX/testdir/preexec_touch
diff --git a/testsuite/build_farm/torture-ATTR.test b/testsuite/build_farm/torture-ATTR.test
deleted file mode 100644
index db6d5e8..0000000
--- a/testsuite/build_farm/torture-ATTR.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "ATTR"
diff --git a/testsuite/build_farm/torture-BROWSE.test b/testsuite/build_farm/torture-BROWSE.test
deleted file mode 100644
index da75897..0000000
--- a/testsuite/build_farm/torture-BROWSE.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "BROWSE"
diff --git a/testsuite/build_farm/torture-DELETE.test b/testsuite/build_farm/torture-DELETE.test
deleted file mode 100644
index 395f449..0000000
--- a/testsuite/build_farm/torture-DELETE.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "DELETE"
diff --git a/testsuite/build_farm/torture-DENY1.test b/testsuite/build_farm/torture-DENY1.test
deleted file mode 100644
index 99ce7ea..0000000
--- a/testsuite/build_farm/torture-DENY1.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "DENY1"
diff --git a/testsuite/build_farm/torture-DENY2.test b/testsuite/build_farm/torture-DENY2.test
deleted file mode 100644
index 17c8f70..0000000
--- a/testsuite/build_farm/torture-DENY2.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "DENY2"
diff --git a/testsuite/build_farm/torture-DIR.test b/testsuite/build_farm/torture-DIR.test
deleted file mode 100644
index 085ce59..0000000
--- a/testsuite/build_farm/torture-DIR.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "DIR"
diff --git a/testsuite/build_farm/torture-DIR1.test b/testsuite/build_farm/torture-DIR1.test
deleted file mode 100644
index 6cc075e..0000000
--- a/testsuite/build_farm/torture-DIR1.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "DIR1"
diff --git a/testsuite/build_farm/torture-FDPASS.test b/testsuite/build_farm/torture-FDPASS.test
deleted file mode 100644
index 40ffdb6..0000000
--- a/testsuite/build_farm/torture-FDPASS.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "FDSESS"
diff --git a/testsuite/build_farm/torture-FDSESS.test b/testsuite/build_farm/torture-FDSESS.test
deleted file mode 100644
index e8af277..0000000
--- a/testsuite/build_farm/torture-FDSESS.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "FDPASS"
diff --git a/testsuite/build_farm/torture-LOCK1.test b/testsuite/build_farm/torture-LOCK1.test
deleted file mode 100644
index fd01c49..0000000
--- a/testsuite/build_farm/torture-LOCK1.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "LOCK1"
diff --git a/testsuite/build_farm/torture-LOCK2.test b/testsuite/build_farm/torture-LOCK2.test
deleted file mode 100644
index 66b671d..0000000
--- a/testsuite/build_farm/torture-LOCK2.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "LOCK2"
diff --git a/testsuite/build_farm/torture-LOCK3.test b/testsuite/build_farm/torture-LOCK3.test
deleted file mode 100644
index dcf1401..0000000
--- a/testsuite/build_farm/torture-LOCK3.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "LOCK3"
diff --git a/testsuite/build_farm/torture-LOCK4.test b/testsuite/build_farm/torture-LOCK4.test
deleted file mode 100644
index 8fdc9b6..0000000
--- a/testsuite/build_farm/torture-LOCK4.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "LOCK4"
diff --git a/testsuite/build_farm/torture-LOCK5.test b/testsuite/build_farm/torture-LOCK5.test
deleted file mode 100644
index a04f83c..0000000
--- a/testsuite/build_farm/torture-LOCK5.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "LOCK5"
diff --git a/testsuite/build_farm/torture-LOCK6.test b/testsuite/build_farm/torture-LOCK6.test
deleted file mode 100644
index 78e139e..0000000
--- a/testsuite/build_farm/torture-LOCK6.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "LOCK6"
diff --git a/testsuite/build_farm/torture-LOCK7.test b/testsuite/build_farm/torture-LOCK7.test
deleted file mode 100644
index fc967fc..0000000
--- a/testsuite/build_farm/torture-LOCK7.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "LOCK7"
diff --git a/testsuite/build_farm/torture-MANGLE.test b/testsuite/build_farm/torture-MANGLE.test
deleted file mode 100644
index 5a3d478..0000000
--- a/testsuite/build_farm/torture-MANGLE.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "MANGLE"
diff --git a/testsuite/build_farm/torture-OPEN.test b/testsuite/build_farm/torture-OPEN.test
deleted file mode 100644
index ee3e55f..0000000
--- a/testsuite/build_farm/torture-OPEN.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "OPEN"
diff --git a/testsuite/build_farm/torture-OPLOCK1.test b/testsuite/build_farm/torture-OPLOCK1.test
deleted file mode 100644
index bb606ad..0000000
--- a/testsuite/build_farm/torture-OPLOCK1.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "OPLOCK1"
diff --git a/testsuite/build_farm/torture-PROPERTIES.test b/testsuite/build_farm/torture-PROPERTIES.test
deleted file mode 100644
index 91fde27..0000000
--- a/testsuite/build_farm/torture-PROPERTIES.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "PROPERTIES"
diff --git a/testsuite/build_farm/torture-RANDOMIPC.test b/testsuite/build_farm/torture-RANDOMIPC.test
deleted file mode 100644
index e510b6b..0000000
--- a/testsuite/build_farm/torture-RANDOMIPC.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "RANDOMIPC"
diff --git a/testsuite/build_farm/torture-RENAME.test b/testsuite/build_farm/torture-RENAME.test
deleted file mode 100644
index 58cb8eb..0000000
--- a/testsuite/build_farm/torture-RENAME.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "RENAME"
diff --git a/testsuite/build_farm/torture-RW1.test b/testsuite/build_farm/torture-RW1.test
deleted file mode 100644
index 6be4a89..0000000
--- a/testsuite/build_farm/torture-RW1.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "RW1"
diff --git a/testsuite/build_farm/torture-RW2.test b/testsuite/build_farm/torture-RW2.test
deleted file mode 100644
index dc457de..0000000
--- a/testsuite/build_farm/torture-RW2.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "RW2"
diff --git a/testsuite/build_farm/torture-TCON.test b/testsuite/build_farm/torture-TCON.test
deleted file mode 100644
index 7d1aba0..0000000
--- a/testsuite/build_farm/torture-TCON.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "TCON"
diff --git a/testsuite/build_farm/torture-TCON1.test b/testsuite/build_farm/torture-TCON1.test
deleted file mode 100644
index 3c92676..0000000
--- a/testsuite/build_farm/torture-TCON1.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "TCON1"
diff --git a/testsuite/build_farm/torture-TCON2.test b/testsuite/build_farm/torture-TCON2.test
deleted file mode 100644
index 1f30a97..0000000
--- a/testsuite/build_farm/torture-TCON2.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "TCON2"
diff --git a/testsuite/build_farm/torture-TCONDEV.test b/testsuite/build_farm/torture-TCONDEV.test
deleted file mode 100644
index 18bd534..0000000
--- a/testsuite/build_farm/torture-TCONDEV.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "TCONDEV"
diff --git a/testsuite/build_farm/torture-TORTURE.test b/testsuite/build_farm/torture-TORTURE.test
deleted file mode 100644
index bc97e94..0000000
--- a/testsuite/build_farm/torture-TORTURE.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "TORTURE"
diff --git a/testsuite/build_farm/torture-TRANS2.test b/testsuite/build_farm/torture-TRANS2.test
deleted file mode 100644
index d2a387f..0000000
--- a/testsuite/build_farm/torture-TRANS2.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "TRANS2"
diff --git a/testsuite/build_farm/torture-UNLINK.test b/testsuite/build_farm/torture-UNLINK.test
deleted file mode 100644
index b7086bb..0000000
--- a/testsuite/build_farm/torture-UNLINK.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "UNLINK"
diff --git a/testsuite/build_farm/torture-XCOPY.test b/testsuite/build_farm/torture-XCOPY.test
deleted file mode 100644
index 94cc797..0000000
--- a/testsuite/build_farm/torture-XCOPY.test
+++ /dev/null
@@ -1,2 +0,0 @@
-. torture_setup.fns
-test_torture "XCOPY"
diff --git a/testsuite/build_farm/torture_setup.fns b/testsuite/build_farm/torture_setup.fns
deleted file mode 100644
index a42be94..0000000
--- a/testsuite/build_farm/torture_setup.fns
+++ /dev/null
@@ -1,19 +0,0 @@
-. basicsmb.fns
-
-test_torture() {
- torture_test=$1
- password=samba
- security=USER
- (test_smb_conf_setup && test_smbpasswd $password ) || return 1
-
- echo $srcdir/bin/smbtorture //localhost/test -U$whoami%$password $torture_test
- $srcdir/bin/smbtorture //localhost/test -U$whoami%$password $torture_test
- status=$?
- if [ $status = 0 ]; then
- echo "smbtorture test $torture_test worked"
- else
- echo "smbtorture test $torture_test FAILED (status $status)!"
- return 1
- fi
- return 0
-}
--
2.7.4
More information about the samba-technical
mailing list