From d5ae7d902a40f26a8c26f4c6d300226689738716 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 14 Jun 2018 09:52:03 -0700 Subject: Sumo refresh Update external subtrees to latest Yocto sumo. Change-Id: I8364f32bef079841c6e57f1c587f4b1bedf62fef Signed-off-by: Brad Bishop --- poky/meta/lib/oeqa/runtime/cases/multilib.py | 4 +++- poky/meta/lib/oeqa/runtime/cases/rpm.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'poky/meta/lib/oeqa/runtime/cases') diff --git a/poky/meta/lib/oeqa/runtime/cases/multilib.py b/poky/meta/lib/oeqa/runtime/cases/multilib.py index 8c167f100..89020386b 100644 --- a/poky/meta/lib/oeqa/runtime/cases/multilib.py +++ b/poky/meta/lib/oeqa/runtime/cases/multilib.py @@ -27,6 +27,8 @@ class MultilibTest(OERuntimeTestCase): @skipIfNotInDataVar('MULTILIBS', 'multilib:lib32', "This isn't a multilib:lib32 image") @OETestDepends(['ssh.SSHTest.test_ssh']) + @OEHasPackage(['binutils']) + @OEHasPackage(['lib32-libc6']) def test_check_multilib_libc(self): """ Check that a multilib image has both 32-bit and 64-bit libc in. @@ -36,6 +38,6 @@ class MultilibTest(OERuntimeTestCase): @OETestID(279) @OETestDepends(['multilib.MultilibTest.test_check_multilib_libc']) - @OEHasPackage(['lib32-connman']) + @OEHasPackage(['lib32-connman', '!connman']) def test_file_connman(self): self.archtest("/usr/sbin/connmand", "ELF32") diff --git a/poky/meta/lib/oeqa/runtime/cases/rpm.py b/poky/meta/lib/oeqa/runtime/cases/rpm.py index 05b94c7b4..84c59a614 100644 --- a/poky/meta/lib/oeqa/runtime/cases/rpm.py +++ b/poky/meta/lib/oeqa/runtime/cases/rpm.py @@ -16,6 +16,7 @@ class RpmBasicTest(OERuntimeTestCase): cls.skipTest('Tests require image to be build from rpm') @OETestID(960) + @OEHasPackage(['rpm']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_rpm_help(self): status, output = self.target.run('rpm --help') -- cgit v1.2.3