summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-06-01 13:03:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:15:00 +0100
commitce57973fd9a5f3794a61d7f45ab74131b5354751 (patch)
tree57bddd9e5011e10b6b561390c89ec9ffe2ab311d
parentb60954ca5fb888596bd86019fe07adf22f3a943a (diff)
downloadpoky-ce57973fd9a5f3794a61d7f45ab74131b5354751.tar.gz
oeqa/runtime/cases/multilib.py: skip if needed packages are not available
1) The test cases use 'readelf' command to do the check. This command is from binutils. So skip the test if the needed binutils package is not installed. The related error message in log.do_testimage is like below. Output: sh: readelf: not found 2) The test case tests /lib/libc.so.6 from lib32-libc6. So skip the test if lib32-libc6 is not installed. The related error message in log.do_testimage is like below. Output: readelf: Error: 'lib/libc.so.6': No such file (From OE-Core rev: eae929a5c224f5c3468d6a0466d1bbb3f678a5a1) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/runtime/cases/multilib.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oeqa/runtime/cases/multilib.py b/meta/lib/oeqa/runtime/cases/multilib.py
index 8c167f1008..970f676981 100644
--- a/meta/lib/oeqa/runtime/cases/multilib.py
+++ b/meta/lib/oeqa/runtime/cases/multilib.py
@@ -27,6 +27,8 @@ class MultilibTest(OERuntimeTestCase):
27 @skipIfNotInDataVar('MULTILIBS', 'multilib:lib32', 27 @skipIfNotInDataVar('MULTILIBS', 'multilib:lib32',
28 "This isn't a multilib:lib32 image") 28 "This isn't a multilib:lib32 image")
29 @OETestDepends(['ssh.SSHTest.test_ssh']) 29 @OETestDepends(['ssh.SSHTest.test_ssh'])
30 @OEHasPackage(['binutils'])
31 @OEHasPackage(['lib32-libc6'])
30 def test_check_multilib_libc(self): 32 def test_check_multilib_libc(self):
31 """ 33 """
32 Check that a multilib image has both 32-bit and 64-bit libc in. 34 Check that a multilib image has both 32-bit and 64-bit libc in.