summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-12-18 18:38:00 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-12-20 11:17:52 +0000
commit044f0acab44acdeb363684215fbbb851bad53808 (patch)
treec64cfb52729f185d9d20e0302833cfc712de73f7
parent2325b0b024fc6c99b0efa571baa60386b66bc1a2 (diff)
downloadopenembedded-core-contrib-044f0acab44acdeb363684215fbbb851bad53808.tar.gz
openembedded-core-contrib-044f0acab44acdeb363684215fbbb851bad53808.tar.bz2
openembedded-core-contrib-044f0acab44acdeb363684215fbbb851bad53808.zip
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/core/utils/concurrencytest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py
index f050289e61..6c403ac0f7 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
@@ -166,7 +167,7 @@ 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")
+ selftestdir = get_test_layer()
newselftestdir = newbuilddir + "/meta-selftest"
bb.utils.mkdirhier(newbuilddir)