[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Mar 12 02:57:02 UTC 2019
The branch, master has been updated
via a68e8af2d1b testsuite: Remove build_farm testsuites
via 345c33d1d0b selftest: Remove RUN_FROM_BUILD_FARM env variable
via a64c2e3bde7 s4/scripting: Remove legacy selftest-vars.sh script
via d192ba4e0bd selftest: Add helper function to create exports file for a testenv
via 0dbb923881a selftest: Move @exported_envvars into Samba.pm
via 3bee2443946 selftest: Remove unused SELFTEST_INTERFACES
via 31aecee1446 samba-tool domain provision: Fix --interactive module in python3
from 1364ae3aeb9 gpo: Backup a policy folder containing GPE.INI
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a68e8af2d1b92ba9a94fc7cc1eb98cdca687d5fd
Author: Tim Beale <timbeale at catalyst.net.nz>
Date: Mon Mar 11 16:03:34 2019 +1300
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>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Mar 12 02:56:05 UTC 2019 on sn-devel-144
commit 345c33d1d0b7a33109ab2cf82774be21ffce7857
Author: Tim Beale <timbeale at catalyst.net.nz>
Date: Mon Mar 11 16:28:16 2019 +1300
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>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit a64c2e3bde7cd0ca62390de191983e520f8ee7da
Author: Tim Beale <timbeale at catalyst.net.nz>
Date: Mon Mar 11 15:37:45 2019 +1300
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>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit d192ba4e0bd82020ca0f34c620a64e616378524c
Author: Tim Beale <timbeale at catalyst.net.nz>
Date: Tue Feb 26 15:52:28 2019 +1300
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>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 0dbb923881a66b1e6b499b5b59103aea58ae0be6
Author: Tim Beale <timbeale at catalyst.net.nz>
Date: Tue Feb 26 13:26:25 2019 +1300
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>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 3bee2443946cf777dd337c20263f499626a0a889
Author: Tim Beale <timbeale at catalyst.net.nz>
Date: Tue Feb 26 12:11:45 2019 +1300
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>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
commit 31aecee1446c5006771aaa535ae85810bbfb5db0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sun Mar 10 23:38:27 2019 +0000
samba-tool domain provision: Fix --interactive module in python3
The prompts were not being printed to the screen because the stream
was not being flushed.
As reported on the samba mailing list by Adam Xu:
https://lists.samba.org/archive/samba/2019-March/221753.html
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13828
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Tim Beale <timbeale at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
python/samba/netcmd/domain.py | 1 +
selftest/selftest.pl | 107 +----------
selftest/target/Samba.pm | 117 ++++++++++++
selftest/wscript | 5 +-
source4/scripting/devel/selftest-vars.sh | 37 ----
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 --
69 files changed, 124 insertions(+), 810 deletions(-)
delete mode 100644 source4/scripting/devel/selftest-vars.sh
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
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index b7aedc16a91..2aebb5f8166 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -390,6 +390,7 @@ class cmd_domain_provision(Command):
print("%s [%s]: " % (prompt, default), end=' ')
else:
print("%s: " % (prompt,), end=' ')
+ sys.stdout.flush()
return sys.stdin.readline().rstrip("\n") or default
try:
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index f04e2b2ce2d..773b28439d4 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 {
@@ -815,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;
@@ -925,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};
@@ -970,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);
@@ -984,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) = @_;
@@ -1045,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 324e1bfb90d..3a2386202a6 100644
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -532,4 +532,121 @@ 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{$_};
+ }
+ }
+}
+
+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;
diff --git a/selftest/wscript b/selftest/wscript
index 727adcf3126..7d8300f055a 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:
diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
deleted file mode 100644
index 50584a16772..00000000000
--- a/source4/scripting/devel/selftest-vars.sh
+++ /dev/null
@@ -1,37 +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 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
-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
diff --git a/source4/selftest/win/README b/source4/selftest/win/README
index fc934385c4d..f6e716c8da0 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 5ca207f62ae..e04a7836d38 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 efaa9f2dcde..00000000000
--- 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 4e68acabec5..00000000000
--- 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 eb0a5c81aa1..00000000000
--- 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
--
Samba Shared Repository
More information about the samba-cvs
mailing list