summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAnibal Limon <anibal.limon@linaro.org>2020-04-28 16:18:05 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-02 09:08:53 +0100
commit81b8656f6beae97fb1f4a99b1d92f71077c716e1 (patch)
tree6da3c9a97e32e72fb4695ebe43a6d9ff6109d419 /meta
parent792d1ebba98b097d4d68c7261bf6af0c9d186eab (diff)
downloadpoky-81b8656f6beae97fb1f4a99b1d92f71077c716e1.tar.gz
oeqa/runtime: Use libdir to run ptest-runner
In multilib build configs libs can be installed in /usr/lib{32,64,x32} so use libdir to specify the correct ptest directory along with default /usr/lib. [YOCTO #12604] (From OE-Core rev: e44ca998c27f494466a524d09f751f963ec9be20) Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/runtime/cases/ptest.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/cases/ptest.py b/meta/lib/oeqa/runtime/cases/ptest.py
index 99a44f0767..1b1474adcf 100644
--- a/meta/lib/oeqa/runtime/cases/ptest.py
+++ b/meta/lib/oeqa/runtime/cases/ptest.py
@@ -49,7 +49,11 @@ class PtestRunnerTest(OERuntimeTestCase):
49 ptest_log_dir = '%s.%s' % (ptest_log_dir_link, timestamp) 49 ptest_log_dir = '%s.%s' % (ptest_log_dir_link, timestamp)
50 ptest_runner_log = os.path.join(ptest_log_dir, 'ptest-runner.log') 50 ptest_runner_log = os.path.join(ptest_log_dir, 'ptest-runner.log')
51 51
52 status, output = self.target.run('ptest-runner', 0) 52 libdir = self.td.get('libdir', '')
53 ptest_dirs = [ '/usr/lib' ]
54 if not libdir in ptest_dirs:
55 ptest_dirs.append(libdir)
56 status, output = self.target.run('ptest-runner -d \"{}\"'.format(' '.join(ptest_dirs)), 0)
53 os.makedirs(ptest_log_dir) 57 os.makedirs(ptest_log_dir)
54 with open(ptest_runner_log, 'w') as f: 58 with open(ptest_runner_log, 'w') as f:
55 f.write(output) 59 f.write(output)