mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 09:49:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

oeqa/sdk: clarify ELF assertion message

Browse Source 
For example, instead of saying "3 != 62", say "Binary was x86-64 but expected
i586".

(From OE-Core rev: 9ab94cea589fca4394ec1fd8dc06b23fd8e990b9)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-12-11 23:26:32 +00:00
committed by Richard Purdie
parent 3bf7cd7182
commit 778f3ce1e6
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
meta/lib/oeqa/sdk/case.py
View File

@@ -1,6 +1,7 @@
# Copyright (C) 2016 Intel Corporation # Copyright (C) 2016 Intel Corporation
# Released under the MIT license (see COPYING.MIT) # Released under the MIT license (see COPYING.MIT)
import os
import subprocess import subprocess
from oeqa.core.case import OETestCase from oeqa.core.case import OETestCase
@@ -26,11 +27,13 @@ class OESDKTestCase(OETestCase):
return tarball return tarball
def check_elf(self, path, target_os=None, target_arch=None): def check_elf(self, path, target_os=None, target_arch=None):
"""
Verify that the ELF binary $path matches the specified target
OS/architecture, or if not specified the currently configured MACHINE's
OS/architecture.
"""
import oe.qa, oe.elf import oe.qa, oe.elf
elf = oe.qa.ELFFile(path)
elf.open()
if not target_os or not target_arch: if not target_os or not target_arch:
output = self._run("echo $OECORE_TARGET_OS:$OECORE_TARGET_ARCH") output = self._run("echo $OECORE_TARGET_OS:$OECORE_TARGET_ARCH")
target_os, target_arch = output.strip().split(":") target_os, target_arch = output.strip().split(":")
@@ -38,7 +41,11 @@ class OESDKTestCase(OETestCase):
machine_data = oe.elf.machine_dict(None)[target_os][target_arch] machine_data = oe.elf.machine_dict(None)[target_os][target_arch]
(machine, osabi, abiversion, endian, bits) = machine_data (machine, osabi, abiversion, endian, bits) = machine_data
self.assertEqual(machine, elf.machine()) elf = oe.qa.ELFFile(path)
elf.open()
self.assertEqual(machine, elf.machine(),
"Binary was %s but expected %s" %
(oe.qa.elf_machine_to_string(elf.machine()), oe.qa.elf_machine_to_string(machine)))
self.assertEqual(bits, elf.abiSize()) self.assertEqual(bits, elf.abiSize())
self.assertEqual(endian, elf.isLittleEndian()) self.assertEqual(endian, elf.isLittleEndian())