diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2023-11-13 04:08:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-13 04:08:51 +0000 |
| commit | 432602aa51bde21e65e23aa73c43cbbac752029b (patch) | |
| tree | 133e2002c0b4165eb9e1d6233e4b8a864d38894c | |
| parent | 978d878f6137ad9da21f5815cb3b698e03827512 (diff) | |
| parent | b4001f4060b5f0df6a5381432d6d3f44101aef74 (diff) | |
| download | vndk-432602aa51bde21e65e23aa73c43cbbac752029b.tar.gz | |
Relax the tests for VNDK 35 am: 00357752d5 am: b4001f4060
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231
Change-Id: Iab0073cb8a43888ff4497b275e8b772f9049540e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | abi/vts_vndk_abi_test.py | 9 | ||||
| -rw-r--r-- | 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" |