[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Sat Dec 17 21:59:03 UTC 2016
The branch, master has been updated
via f09f5ae selftest: make sure we always export KRB5CCNAME
via cbbd95c selftest: also export TMPDIR
via 60a8e70 script/autobuild.py: create tmpdir for each try and export it as TMPDIR
via 49de2f3 script/autobuild.py: cleanup testbase/prefix before each retry
via b8c6330 script/autobuild.py: remove pointless mkdir/rmdir commands
via 6f0ffd7 script/autobuild.py: don't add subdirs of testbase to cleanup_list
from e717ca6 vfs_gpfs: simplify stat_with_capability() ifdef
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f09f5ae631c64da016072b1c09c172f4673a06cd
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Dec 16 11:09:16 2016 +0100
selftest: make sure we always export KRB5CCNAME
We should not risk the usage of the users global ccache!
This results in unpredictable effects for the user and
selftest itself.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Sat Dec 17 22:58:28 CET 2016 on sn-devel-144
commit cbbd95c7f23787263e5d07b765b1d9cde01bd6b1
Author: Stefan Metzmacher <metze at samba.org>
Date: Thu Dec 15 10:31:50 2016 +0100
selftest: also export TMPDIR
This should hopefully avoid usage of /tmp.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 60a8e70fe1cb278295ededc41015b09cecb00d48
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Dec 16 13:35:36 2016 +0100
script/autobuild.py: create tmpdir for each try and export it as TMPDIR
This way the compiler and other tools hopefully don't use /tmp
anymore.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 49de2f3a79bd12a7f7bc17bc5f4bae36d23f2489
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Dec 16 13:35:01 2016 +0100
script/autobuild.py: cleanup testbase/prefix before each retry
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit b8c63307bd6b2116c85d0ac9cf249b1e8ef7e0a6
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Dec 16 13:33:42 2016 +0100
script/autobuild.py: remove pointless mkdir/rmdir commands
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 6f0ffd767ce610b28884c76f52f7f80652fd413d
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Dec 16 13:30:57 2016 +0100
script/autobuild.py: don't add subdirs of testbase to cleanup_list
We already have testbase in there.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
script/autobuild.py | 13 +++++++------
selftest/selftest.pl | 9 +++++++++
2 files changed, 16 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/script/autobuild.py b/script/autobuild.py
index 356b7fa..3d76130 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -276,11 +276,7 @@ class builder(object):
self.stderr = open(self.stderr_path, 'w')
self.stdin = open("/dev/null", 'r')
self.sdir = "%s/%s" % (testbase, self.tag)
- self.prefix = "%s/prefix/%s" % (testbase, self.tag)
- run_cmd("rm -rf %s" % self.sdir)
- cleanup_list.append(self.sdir)
- cleanup_list.append(self.prefix)
- os.makedirs(self.sdir)
+ self.prefix = "%s/%s" % (test_prefix, self.tag)
run_cmd("rm -rf %s" % self.sdir)
if cp:
run_cmd("cp --recursive --link --archive %s %s" % (test_master, self.sdir), dir=test_master, show=True)
@@ -712,6 +708,9 @@ if options.retry:
testbase = "%s/b%u" % (options.testbase, os.getpid())
test_master = "%s/master" % testbase
+test_prefix = "%s/prefix" % testbase
+test_tmpdir = "%s/tmp" % testbase
+os.environ['TMPDIR'] = test_tmpdir
# get the top commit message, for emails
top_commit_msg = run_cmd("git log -1", dir=gitroot, output=True)
@@ -734,7 +733,9 @@ start_time = time.time()
while True:
try:
run_cmd("rm -rf %s" % test_master)
- cleanup_list.append(test_master)
+ run_cmd("rm -rf %s" % test_prefix)
+ run_cmd("rm -rf %s" % test_tmpdir)
+ os.makedirs(test_tmpdir)
run_cmd("git clone --recursive --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)
except Exception:
cleanup()
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 7d71013..c54ea68 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -654,6 +654,7 @@ if ($#testlists == -1) {
$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;
@@ -667,6 +668,9 @@ if ($opt_quick) {
}
$ENV{SELFTEST_MAXTIME} = $torture_maxtime;
+my $selftest_krbt_ccache_path = "$tmpdir_abs/selftest.krb5_ccache";
+$ENV{KRB5CCNAME} = "FILE:${selftest_krbt_ccache_path}.global";
+
my @available = ();
foreach my $fn (@testlists) {
foreach (read_testlist($fn)) {
@@ -885,6 +889,8 @@ sub setup_env($$)
$option = "client" if $option eq "";
+ $ENV{KRB5CCNAME} = "FILE:${selftest_krbt_ccache_path}.${envname}/ignore";
+
if (defined(get_running_env($envname))) {
$testenv_vars = get_running_env($envname);
if (not $testenv_vars->{target}->check_env($testenv_vars)) {
@@ -926,6 +932,9 @@ sub setup_env($$)
}
}
+ my $krb5_ccache_path = "${selftest_krbt_ccache_path}.${envname}.${option}";
+ unlink($krb5_ccache_path);
+ $ENV{KRB5CCNAME} = "FILE:${krb5_ccache_path}";
return $testenv_vars;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list