diff options
author | Anibal Limon <anibal.limon@linaro.org> | 2020-04-28 16:18:05 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-02 09:08:46 +0100 |
commit | e44ca998c27f494466a524d09f751f963ec9be20 (patch) | |
tree | 6248c7be5a2e7882d2fc839d80b977d25bd5a350 /meta/lib/oeqa/runtime/cases/ptest.py | |
parent | 1203ee86e3cf4d73f6ba513452717f1c4f78c501 (diff) | |
download | openembedded-core-contrib-e44ca998c27f494466a524d09f751f963ec9be20.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]
Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/runtime/cases/ptest.py')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/ptest.py | 6 |
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): ptest_log_dir = '%s.%s' % (ptest_log_dir_link, timestamp) ptest_runner_log = os.path.join(ptest_log_dir, 'ptest-runner.log') - status, output = self.target.run('ptest-runner', 0) + libdir = self.td.get('libdir', '') + ptest_dirs = [ '/usr/lib' ] + if not libdir in ptest_dirs: + ptest_dirs.append(libdir) + status, output = self.target.run('ptest-runner -d \"{}\"'.format(' '.join(ptest_dirs)), 0) os.makedirs(ptest_log_dir) with open(ptest_runner_log, 'w') as f: f.write(output) |