From 04a6967bc393e0305bac9f33a42cceb4eb88f20b Mon Sep 17 00:00:00 2001 From: Joe Guo Date: Wed, 22 May 2019 23:50:01 +1200 Subject: script/autobuild.py: define cwd for builder and avoid chdir We can pass cwd in Popen, no need to chdir for each cmd. Signed-off-by: Joe Guo Reviewed-by: Gary Lockyer Reviewed-by: Andrew Bartlett --- script/autobuild.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'script') diff --git a/script/autobuild.py b/script/autobuild.py index b0d9f14a958..bb5ab4094d4 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -745,6 +745,7 @@ class builder(object): 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.prefix = "%s/%s" % (test_prefix, self.tag) run_cmd("rm -rf %s" % self.test_source_dir) run_cmd("rm -rf %s" % self.prefix) @@ -771,13 +772,10 @@ class builder(object): self.cmd = self.cmd.replace("${LOG_BASE}", options.log_base) self.cmd = self.cmd.replace("${NAME}", self.name) self.cmd = self.cmd.replace("${ENABLE_COVERAGE}", options.enable_coverage) - cwd = os.getcwd() - os.chdir("%s/%s" % (self.test_source_dir, self.dir)) - do_print('%s: [%s] Running %s in %r' % (self.name, self.stage, self.cmd, os.getcwd())) + do_print('%s: [%s] Running %s in %r' % (self.name, self.stage, self.cmd, self.cwd)) self.proc = Popen(self.cmd, shell=True, - close_fds=True, + close_fds=True, cwd=self.cwd, stdout=self.stdout, stderr=self.stderr, stdin=self.stdin) - os.chdir(cwd) self.next += 1 -- cgit v1.2.1