From 56d2493a9adfcc47ae7e265439e05ff42cdbbbbf Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 18 Dec 2018 18:38:00 -0800 Subject: oeqa/concurrencytest: fix for locating meta-selftest The previous code assumed builddir and meta-selftest are in the same dir, but this isn't always true, builddir can be anywhere, use get_test_layer() to locate meta-selftest can fix the problem. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/lib/oeqa/core/utils/concurrencytest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index f050289e61..e050818f0f 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -25,6 +25,7 @@ from itertools import cycle from subunit import ProtocolTestCase, TestProtocolClient from subunit.test_results import AutoTimingTestResultDecorator from testtools import ThreadsafeForwardingResult, iterate_tests +from oeqa.utils.commands import get_test_layer import bb.utils import oe.path @@ -141,6 +142,9 @@ def removebuilddir(d): def fork_for_tests(concurrency_num, suite): result = [] + if 'BUILDDIR' in os.environ: + selftestdir = get_test_layer() + test_blocks = partition_tests(suite, concurrency_num) # Clear the tests from the original suite so it doesn't keep them alive suite._tests[:] = [] @@ -166,7 +170,6 @@ def fork_for_tests(concurrency_num, suite): if 'BUILDDIR' in os.environ: builddir = os.environ['BUILDDIR'] newbuilddir = builddir + "-st-" + str(ourpid) - selftestdir = os.path.abspath(builddir + "/../meta-selftest") newselftestdir = newbuilddir + "/meta-selftest" bb.utils.mkdirhier(newbuilddir) -- cgit 1.2.3-korg