From 4ede48f660dd360a39cbb9e156d3638c89e9301d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 6 Oct 2025 14:09:02 +0100 Subject: [PATCH] oeqa/selftest: Fix single threaded race issue oe-selftest sets up separate build directories to run the tests in. To to this, environment paths pointing at the previous build directory are updated. In the multi-threaded case this is fine as the thread is destroyed and the parent remains unchanged but in the single threaded case, the environment is broken afterwards. This can mean we try and access a directory which is in the process of being deleted (e.g. by clobberdir). Restore the environment afterwards regardless to ensure the single threaded case doesn't try and access the build directory which is now being deleted. (From OE-Core rev: a165bec28ffc75fd44b1fdb02a0d3a80c5a4769b) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/context.py | 4 ++++ 1 file changed, 4 insertions(+) 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)