From b69f91f786d58c1e91875cbab2d748bc102ab939 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Thu, 11 Jul 2013 22:00:51 +0300 Subject: lib/oeqa/runtime/multilib.py: use readelf instead of file file was pulled by rpm in sato images, readelf comes with binutils so it's in ipk/deb too. Also the test was looking at connmand instead of connman-applet (which is what the testcase says and the AB nightly-multilib target installs) (From OE-Core rev: c2c47a002996b8dbcf9b311dff677202b1f11a64) Signed-off-by: Stefan Stanacar Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/lib/oeqa/runtime/multilib.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/runtime/multilib.py b/meta/lib/oeqa/runtime/multilib.py index 397d075115..2d952aabdd 100644 --- a/meta/lib/oeqa/runtime/multilib.py +++ b/meta/lib/oeqa/runtime/multilib.py @@ -1,5 +1,6 @@ import unittest from oeqa.oetest import oeRuntimeTest, skipModule +from oeqa.utils.decorators import * def setUpModule(): multilibs = oeRuntimeTest.tc.d.getVar("MULTILIBS", True) or "" @@ -7,8 +8,10 @@ def setUpModule(): skipModule("this isn't a multilib:lib32 image") -class MultilibFileTest(oeRuntimeTest): +class MultilibTest(oeRuntimeTest): + @skipUnlessPassed('test_ssh') def test_file_connman(self): - (status, output) = self.target.run('file -L /usr/sbin/connmand | grep "ELF 32-bit LSB executable"') - self.assertEqual(status, 0, msg="status and output : %s and %s" % (status,output)) + self.assertTrue(oeRuntimeTest.hasPackage('connman-gnome'), msg="This test assumes connman-gnome is installed") + (status, output) = self.target.run("readelf -h /usr/bin/connman-applet | sed -n '3p' | awk '{print $2}'") + self.assertEqual(output, "ELF32", msg="connman-applet isn't an ELF32 binary. readelf says: %s" % self.target.run("readelf -h /usr/bin/connman-applet")[1]) -- cgit v1.2.3-54-g00ecf