From 957fe055027178ecd912a407dd104e6502e6c568 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Oct 2025 23:07:01 +0100 Subject: oeqa/selftest: Fix single threaded race issue (From OE-Core rev: 22a2bb82c452bda9847295b5437aab1d639360ec) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 16f82c6737..c9eb481725 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -44,9 +44,13 @@ class NonConcurrentTestSuite(unittest.TestSuite): self.bb_vars = bb_vars def run(self, result): + origenv = os.environ.copy() (builddir, newbuilddir) = self.setupfunc("-st", None, self.suite) ret = super().run(result) + # In forks we don't have to restore but in a single process, restore cwd and the env os.chdir(builddir) + for e in origenv: + os.environ[e] = origenv[e] if newbuilddir and ret.wasSuccessful() and self.removefunc: self.removefunc(newbuilddir) -- cgit v1.2.3-54-g00ecf