diff options
author | Stefan Metzmacher <metze@samba.org> | 2020-11-19 15:11:39 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2021-04-13 08:23:35 +0000 |
commit | e315ce40c249c6cd24c07f53b1eb8a8a8f77a175 (patch) | |
tree | 97c9651aff641f47c3cc62578e1b95dc434a1f1c /script | |
parent | ba6f6a3cce1b55026ebbfae3ceccb5ed5c3e00c5 (diff) | |
download | samba-e315ce40c249c6cd24c07f53b1eb8a8a8f77a175.tar.gz |
script/autobuild.py: defer cp and git clone
This will make further reconstruction easier.
Use 'git show -w' to see the minimal diff.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'script')
-rwxr-xr-x | script/autobuild.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index 4007c6c0540..a3cd8528397 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -968,15 +968,16 @@ class builder(object): self.cwd = "%s/%s" % (self.test_source_dir, self.dir) self.selftest_prefix = "%s/bin/ab" % (self.cwd) self.prefix = "%s/%s" % (test_prefix, self.tag) - rmdir_force(self.test_source_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) - else: - run_cmd("git clone --recursive --shared %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True) - self.start_next() def start_next(self): + if self.next == 0: + rmdir_force(self.test_source_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) + else: + run_cmd("git clone --recursive --shared %s %s" % (test_master, self.test_source_dir), dir=test_master, show=True) + if self.next == len(self.sequence): if not options.nocleanup: rmdir_force(self.test_source_dir) @@ -1081,6 +1082,10 @@ class buildlist(object): time.sleep(0.1) def run(self): + for b in self.tlist: + b.start_next() + if options.retry: + self.retry.start_next() while True: b = self.wait_one() if options.retry and self.need_retry: |