LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assert the output file of header-abi-diff

Browse Source 
Test: ./test.py
Bug: 259148872
Change-Id: Ie4270b3fe8c76a63d0b82f246e012d7ca2622fd4
This commit is contained in:
Hsin-Yi Chen
2022-12-12 15:07:55 +08:00
parent 42aa38f51e
commit 98d1ee8c04
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vndk/tools/header-checker/tests/test.py
View File

@@ -78,14 +78,16 @@ class HeaderCheckerTest(unittest.TestCase):
def run_and_compare_abi_diff(self, old_dump, new_dump, lib, arch,
expected_return_code, flags=[]):
actual_output = run_abi_diff(old_dump, new_dump, arch, lib, flags)
self.assertEqual(actual_output, expected_return_code)
return_code, output = run_abi_diff(old_dump, new_dump, arch, lib,
flags)
self.assertEqual(return_code, expected_return_code)
return output
def prepare_and_run_abi_diff(self, old_ref_dump_path, new_ref_dump_path,
target_arch, expected_return_code, flags=[]):
self.run_and_compare_abi_diff(old_ref_dump_path, new_ref_dump_path,
'test', target_arch,
expected_return_code, flags)
return self.run_and_compare_abi_diff(
old_ref_dump_path, new_ref_dump_path, 'test', target_arch,
expected_return_code, flags)
def get_or_create_dump(self, module, create):
if create:
@@ -101,14 +103,18 @@ class HeaderCheckerTest(unittest.TestCase):
old_modules = Module.get_test_modules_by_name(old_lib)
new_modules = Module.get_test_modules_by_name(new_lib)
self.assertEqual(len(old_modules), len(new_modules))
self.assertTrue(len(old_modules))
for old_module, new_module in zip(old_modules, new_modules):
self.assertEqual(old_module.arch, new_module.arch)
old_dump_path = self.get_or_create_dump(old_module, create_old)
new_dump_path = self.get_or_create_dump(new_module, create_new)
self.prepare_and_run_abi_diff(
output = self.prepare_and_run_abi_diff(
old_dump_path, new_dump_path, new_module.arch,
expected_return_code, flags)
# Since most test cases are independent of architecture, verifying one
# of the reports is sufficient.
return output
def prepare_and_absolute_diff_all_archs(self, old_lib, new_lib):
old_modules = Module.get_test_modules_by_name(old_lib)
@@ -411,10 +417,17 @@ class HeaderCheckerTest(unittest.TestCase):
self.assertRegex(os.path.basename(resource_dir), r"^[\d.]+$")
def test_struct_extensions(self):
self.prepare_and_run_abi_diff_all_archs(
output = self.prepare_and_run_abi_diff_all_archs(
"libstruct_extensions", "liballowed_struct_extensions", 4,
flags=["-input-format-new", "Json", "-input-format-old", "Json"],
create_old=False, create_new=False)
self.assertEqual(output.count("record_type_extension_diffs"), 6)
output = self.prepare_and_run_abi_diff_all_archs(
"liballowed_struct_extensions", "libstruct_extensions", 8,
flags=["-input-format-new", "Json", "-input-format-old", "Json"],
create_old=False, create_new=False)
self.assertEqual(output.count("record_type_diffs"), 6)
def test_param_size_diff(self):
self.prepare_and_run_abi_diff_all_archs(

11
vndk/tools/header-checker/utils/utils.py
View File

@@ -305,12 +305,13 @@ def run_abi_diff(old_test_dump_path, new_test_dump_path, arch, lib_name,
abi_diff_cmd += ['-input-format-old', DEFAULT_FORMAT]
if '-input-format-new' not in flags:
abi_diff_cmd += ['-input-format-new', DEFAULT_FORMAT]
try:
subprocess.check_call(abi_diff_cmd)
except subprocess.CalledProcessError as err:
return err.returncode
return 0
result = subprocess.run(abi_diff_cmd)
output = ""
if os.path.isfile(output_name):
with open(output_name, 'r') as output_file:
output = output_file.read()
return result.returncode, output
def get_build_vars_for_product(names, product=None, variant=None):