diff options
author | Stefan Metzmacher <metze@samba.org> | 2016-12-16 13:35:01 +0100 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2016-12-17 19:16:14 +0100 |
commit | 49de2f3a79bd12a7f7bc17bc5f4bae36d23f2489 (patch) | |
tree | 1aa1afe97d5720a60d7a5b1775a1297f472c30fb /script/autobuild.py | |
parent | b8c63307bd6b2116c85d0ac9cf249b1e8ef7e0a6 (diff) | |
download | samba-49de2f3a79bd12a7f7bc17bc5f4bae36d23f2489.tar.gz |
script/autobuild.py: cleanup testbase/prefix before each retry
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'script/autobuild.py')
-rwxr-xr-x | script/autobuild.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index 396cb6af2fd..9fc5c90e12f 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -276,7 +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) + 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) @@ -708,6 +708,7 @@ if options.retry: testbase = "%s/b%u" % (options.testbase, os.getpid()) test_master = "%s/master" % testbase +test_prefix = "%s/prefix" % testbase # get the top commit message, for emails top_commit_msg = run_cmd("git log -1", dir=gitroot, output=True) @@ -730,6 +731,7 @@ start_time = time.time() while True: try: run_cmd("rm -rf %s" % test_master) + run_cmd("rm -rf %s" % test_prefix) run_cmd("git clone --recursive --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot) except Exception: cleanup() |