From 00357752d5fdd622d10fbbea2ad49805001df4ba Mon Sep 17 00:00:00 2001 From: Hsin-Yi Chen Date: Thu, 5 Oct 2023 11:23:20 +0800 Subject: Relax the tests for VNDK 35 VNDK 35 will not be frozen. There will be no library lists or ABI dumps. For devices reporting ro.vndk.version=35, vts_vndk_abi_test is skipped. vts_vndk_dependency_test and vts_vndk_files_test load the "current" library lists. Test: atest vts_vndk_abi_test vts_vndk_dependency_test vts_vndk_files_test Bug: 303303471 Change-Id: I519522b6d11dd50182a6f30237f697a48c8b752d Merged-In: I519522b6d11dd50182a6f30237f697a48c8b752d (cherry picked from commit 075c80cd4bec54bf40f2e589ecbc7cf7c7eaedb9) --- abi/vts_vndk_abi_test.py | 9 +++++++++ golden/vndk_data.py | 5 +++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/abi/vts_vndk_abi_test.py b/abi/vts_vndk_abi_test.py index 140c1c4..85627a3 100644 --- a/abi/vts_vndk_abi_test.py +++ b/abi/vts_vndk_abi_test.py @@ -314,6 +314,15 @@ class VtsVndkAbiTest(unittest.TestCase): dump_version = self._dut.GetVndkVersion() self.assertTrue(dump_version, "Cannot determine VNDK version.") + # VNDK 35 will not be frozen. + try: + if int(dump_version) > 34: + logging.info("Skip the test. version: %s ABI: %s bitness: %d", + dump_version, primary_abi, bitness) + return + except ValueError: + pass + dump_paths = vndk_data.GetAbiDumpPathsFromResources( dump_version, binder_bitness, diff --git a/golden/vndk_data.py b/golden/vndk_data.py index cf0cd59..a35c1c0 100644 --- a/golden/vndk_data.py +++ b/golden/vndk_data.py @@ -198,8 +198,9 @@ def LoadVndkLibraryListsFromResources(version, *tags): logging.error("Could not import resources module.") return None - version_str = (version if version and re.match("\\d+", version) else - "current") + # VNDK 35 will not be frozen. + version_str = (version if re.match("\\d+", version) and int(version) <= 34 + else "current") vndk_lib_list_name = version_str + ".txt" vndk_lib_extra_list_name = "vndk-lib-extra-list-" + version_str + ".txt" -- cgit v1.2.3