summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2013-07-11 22:00:51 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-16 10:04:15 +0100
commitb69f91f786d58c1e91875cbab2d748bc102ab939 (patch)
treef85b411deeee3d1358008cef20ce6c300fff6a3c
parent9c4a02b6c6dd9c450791bde3e9acb61b85244fe1 (diff)
downloadpoky-b69f91f786d58c1e91875cbab2d748bc102ab939.tar.gz
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 <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/runtime/multilib.py9
1 files 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 @@
1import unittest 1import unittest
2from oeqa.oetest import oeRuntimeTest, skipModule 2from oeqa.oetest import oeRuntimeTest, skipModule
3from oeqa.utils.decorators import *
3 4
4def setUpModule(): 5def setUpModule():
5 multilibs = oeRuntimeTest.tc.d.getVar("MULTILIBS", True) or "" 6 multilibs = oeRuntimeTest.tc.d.getVar("MULTILIBS", True) or ""
@@ -7,8 +8,10 @@ def setUpModule():
7 skipModule("this isn't a multilib:lib32 image") 8 skipModule("this isn't a multilib:lib32 image")
8 9
9 10
10class MultilibFileTest(oeRuntimeTest): 11class MultilibTest(oeRuntimeTest):
11 12
13 @skipUnlessPassed('test_ssh')
12 def test_file_connman(self): 14 def test_file_connman(self):
13 (status, output) = self.target.run('file -L /usr/sbin/connmand | grep "ELF 32-bit LSB executable"') 15 self.assertTrue(oeRuntimeTest.hasPackage('connman-gnome'), msg="This test assumes connman-gnome is installed")
14 self.assertEqual(status, 0, msg="status and output : %s and %s" % (status,output)) 16 (status, output) = self.target.run("readelf -h /usr/bin/connman-applet | sed -n '3p' | awk '{print $2}'")
17 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])