diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2023-11-10 07:46:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-10 07:46:37 +0000 |
| commit | dfc1ecae2307dd79d982f5f0f8f65a8f26c325ce (patch) | |
| tree | 94eab7b8080661c305b10fa1e6fc08bffad23d83 | |
| parent | e2060957a4fbbe65d52327c33002bebfca632bca (diff) | |
| parent | f9bd962baa8e9e00461b77c5c6f183bf8e489b2b (diff) | |
| download | vndk-dfc1ecae2307dd79d982f5f0f8f65a8f26c325ce.tar.gz | |
Skip VNDK tests if ro.vndk.version is empty am: f9bd962baa
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824232
Change-Id: Id84595ed21dbf81d7ee2d4e505ca1488b57c6863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | abi/vts_vndk_abi_test.py | 3 | ||||
| -rw-r--r-- | dependency/vts_vndk_dependency_test.py | 2 | ||||
| -rw-r--r-- | files/vts_vndk_files_test.py | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/abi/vts_vndk_abi_test.py b/abi/vts_vndk_abi_test.py index 85627a3..a8633bf 100644 --- a/abi/vts_vndk_abi_test.py +++ b/abi/vts_vndk_abi_test.py @@ -307,6 +307,9 @@ class VtsVndkAbiTest(unittest.TestCase): Args: bitness: 32 or 64, the bitness of the tested libraries. """ + if not vndk_utils.IsVndkRequired(self._dut): + logging.info("Skip the test as the device does not require VNDK.") + return self.assertTrue(self._dut.IsRoot(), "This test requires adb root.") primary_abi = self._dut.GetCpuAbiList()[0] binder_bitness = self._dut.GetBinderBitness() diff --git a/dependency/vts_vndk_dependency_test.py b/dependency/vts_vndk_dependency_test.py index 6383450..e829558 100644 --- a/dependency/vts_vndk_dependency_test.py +++ b/dependency/vts_vndk_dependency_test.py @@ -117,6 +117,8 @@ class VtsVndkDependencyTest(unittest.TestCase): sp_hal_strings = vndk_lists[0] self._sp_hal = [re.compile(x) for x in sp_hal_strings] (self._ll_ndk, self._vndk, self._vndk_sp) = vndk_lists[1:] + if not vndk_utils.IsVndkRequired(self._dut): + (self._vndk, self._vndk_sp) = ([], []) logging.debug("LL_NDK: %s", self._ll_ndk) logging.debug("SP_HAL: %s", sp_hal_strings) diff --git a/files/vts_vndk_files_test.py b/files/vts_vndk_files_test.py index faa3e6a..777cd94 100644 --- a/files/vts_vndk_files_test.py +++ b/files/vts_vndk_files_test.py @@ -122,7 +122,7 @@ class VtsVndkFilesTest(unittest.TestCase): if unexpected: self._Fail(unexpected, "%s must not contain %s libraries." % - (vndk_dir, ", ",join(vndk_list_names))) + (vndk_dir, ", ".join(vndk_list_names))) def _TestVndkCoreDirectory(self, bitness): """Verifies that VNDK directory doesn't contain extra files.""" @@ -130,6 +130,9 @@ class VtsVndkFilesTest(unittest.TestCase): logging.info("Skip the test as VNDK runtime is not enforced on " "the device.") return + if not vndk_utils.IsVndkRequired(self._dut): + logging.info("Skip the test as the device does not require VNDK.") + return self._TestVndkDirectory( vndk_utils.GetVndkDirectory(bitness, self._vndk_version), (vndk_data.VNDK, vndk_data.VNDK_PRIVATE, vndk_data.VNDK_SP, |