summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-06-01 13:03:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-04 15:15:00 +0100
commit7937e471b6cb18f6f454523cd4ee32489b91f296 (patch)
tree4c62ced267c39c6d4b68258e2ca0723c845c1662 /meta/lib
parentce57973fd9a5f3794a61d7f45ab74131b5354751 (diff)
downloadpoky-7937e471b6cb18f6f454523cd4ee32489b91f296.tar.gz
oeqa/runtime/cases/multilib.py: fix test_file_connman skipping logic
The test_file_connman should be executed only when 'lib32-connman' is installed and 'connman' is not installed. When lib32-connman and connman are both installed, the /usr/sbin/connmand could be from connman or lib32-connman, depending on the installation order. What we want to check is the connmand command from lib32-connman, so we need to make sure that connman is not there to cause chaos. (From OE-Core rev: bc6839394c06bb695b92b2183337e7381da1e86c) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/runtime/cases/multilib.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/runtime/cases/multilib.py b/meta/lib/oeqa/runtime/cases/multilib.py
index 970f676981..89020386b1 100644
--- a/meta/lib/oeqa/runtime/cases/multilib.py
+++ b/meta/lib/oeqa/runtime/cases/multilib.py
@@ -38,6 +38,6 @@ class MultilibTest(OERuntimeTestCase):
38 38
39 @OETestID(279) 39 @OETestID(279)
40 @OETestDepends(['multilib.MultilibTest.test_check_multilib_libc']) 40 @OETestDepends(['multilib.MultilibTest.test_check_multilib_libc'])
41 @OEHasPackage(['lib32-connman']) 41 @OEHasPackage(['lib32-connman', '!connman'])
42 def test_file_connman(self): 42 def test_file_connman(self):
43 self.archtest("/usr/sbin/connmand", "ELF32") 43 self.archtest("/usr/sbin/connmand", "ELF32")