diff options
Diffstat (limited to 'meta/lib/oeqa/runtime')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/multilib.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/lib/oeqa/runtime/cases/multilib.py b/meta/lib/oeqa/runtime/cases/multilib.py index 62e662b01c..56aed62eea 100644 --- a/meta/lib/oeqa/runtime/cases/multilib.py +++ b/meta/lib/oeqa/runtime/cases/multilib.py | |||
@@ -7,6 +7,8 @@ from oeqa.core.decorator.depends import OETestDepends | |||
7 | from oeqa.core.decorator.data import skipIfNotInDataVar | 7 | from oeqa.core.decorator.data import skipIfNotInDataVar |
8 | from oeqa.runtime.decorator.package import OEHasPackage | 8 | from oeqa.runtime.decorator.package import OEHasPackage |
9 | 9 | ||
10 | import subprocess | ||
11 | |||
10 | class MultilibTest(OERuntimeTestCase): | 12 | class MultilibTest(OERuntimeTestCase): |
11 | 13 | ||
12 | def archtest(self, binary, arch): | 14 | def archtest(self, binary, arch): |
@@ -14,8 +16,10 @@ class MultilibTest(OERuntimeTestCase): | |||
14 | Check that ``binary`` has the ELF class ``arch`` (e.g. ELF32/ELF64). | 16 | Check that ``binary`` has the ELF class ``arch`` (e.g. ELF32/ELF64). |
15 | """ | 17 | """ |
16 | 18 | ||
17 | status, output = self.target.run('readelf -h %s' % binary) | 19 | dest = "{}/test_binary".format(self.td.get('T', '')) |
18 | self.assertEqual(status, 0, 'Failed to readelf %s' % binary) | 20 | self.target.copyFrom(binary, dest) |
21 | output = subprocess.check_output("readelf -h {}".format(dest), shell=True).decode() | ||
22 | os.remove(dest) | ||
19 | 23 | ||
20 | l = [l.split()[1] for l in output.split('\n') if "Class:" in l] | 24 | l = [l.split()[1] for l in output.split('\n') if "Class:" in l] |
21 | if l: | 25 | if l: |
@@ -29,7 +33,6 @@ class MultilibTest(OERuntimeTestCase): | |||
29 | @skipIfNotInDataVar('MULTILIBS', 'multilib:lib32', | 33 | @skipIfNotInDataVar('MULTILIBS', 'multilib:lib32', |
30 | "This isn't a multilib:lib32 image") | 34 | "This isn't a multilib:lib32 image") |
31 | @OETestDepends(['ssh.SSHTest.test_ssh']) | 35 | @OETestDepends(['ssh.SSHTest.test_ssh']) |
32 | @OEHasPackage(['binutils']) | ||
33 | @OEHasPackage(['lib32-libc6']) | 36 | @OEHasPackage(['lib32-libc6']) |
34 | def test_check_multilib_libc(self): | 37 | def test_check_multilib_libc(self): |
35 | """ | 38 | """ |