From 404cd173e9e166c5b7c57c6cfc3e0366d7672893 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 17 Dec 2020 11:53:21 +0100 Subject: script/autobuild.py: store the directory for the running builder in self.builder_dir For now it keeps being the same as self.test_source_dir, but that will change soon. Signed-off-by: Stefan Metzmacher Reviewed-by: Andrew Bartlett Reviewed-by: Andreas Schneider --- script/autobuild.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/script/autobuild.py b/script/autobuild.py index a3cd8528397..2580f1fe06a 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -964,23 +964,24 @@ class builder(object): self.stdout = open(self.stdout_path, 'w') self.stderr = open(self.stderr_path, 'w') self.stdin = open("/dev/null", 'r') - self.test_source_dir = "%s/%s" % (testbase, self.tag) - self.cwd = "%s/%s" % (self.test_source_dir, self.dir) + self.builder_dir = "%s/%s" % (testbase, self.tag) + self.test_source_dir = self.builder_dir + self.cwd = "%s/%s" % (self.builder_dir, self.dir) self.selftest_prefix = "%s/bin/ab" % (self.cwd) self.prefix = "%s/%s" % (test_prefix, self.tag) def start_next(self): if self.next == 0: - rmdir_force(self.test_source_dir) + rmdir_force(self.builder_dir) rmdir_force(self.prefix) if not self.git_clone_required: - run_cmd("cp -R -a -l %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True) + run_cmd("cp -R -a -l %s %s" % (test_master, self.builder_dir), dir=test_master, show=True) else: - run_cmd("git clone --recursive --shared %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True) + run_cmd("git clone --recursive --shared %s %s" % (test_master, self.builder_dir), dir=test_master, show=True) if self.next == len(self.sequence): if not options.nocleanup: - rmdir_force(self.test_source_dir) + rmdir_force(self.builder_dir) rmdir_force(self.prefix) do_print('%s: Completed OK' % self.name) self.done = True -- cgit v1.2.1