oeqa/multilib: rework to use readelf from the host

It is difficult and error-prone to ensure binutils gets
installed into target images where this test may run;
on the other hand readelf is always present on the
host, as it is a part of HOSTTOOLS.

(From OE-Core rev: b7f62b28acb0efc9e9bf0126bd2425dcca012fd1)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-08-27 12:59:32 +02:00
committed by Richard Purdie
parent 2f7f9bc0f1
commit b0bee2b736

View File

@@ -7,6 +7,8 @@ from oeqa.core.decorator.depends import OETestDepends
from oeqa.core.decorator.data import skipIfNotInDataVar
from oeqa.runtime.decorator.package import OEHasPackage
import subprocess
class MultilibTest(OERuntimeTestCase):
def archtest(self, binary, arch):
@@ -14,8 +16,10 @@ class MultilibTest(OERuntimeTestCase):
Check that ``binary`` has the ELF class ``arch`` (e.g. ELF32/ELF64).
"""
status, output = self.target.run('readelf -h %s' % binary)
self.assertEqual(status, 0, 'Failed to readelf %s' % binary)
dest = "{}/test_binary".format(self.td.get('T', ''))
self.target.copyFrom(binary, dest)
output = subprocess.check_output("readelf -h {}".format(dest), shell=True).decode()
os.remove(dest)
l = [l.split()[1] for l in output.split('\n') if "Class:" in l]
if l:
@@ -29,7 +33,6 @@ 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):
"""