diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2023-12-04 09:16:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-04 09:16:08 +0000 |
| commit | ab59a9388211e71075c88adcf145f516b5c4006b (patch) | |
| tree | 32268a91b469d0ad4d4ffe8631c67692c77be8f9 | |
| parent | bfbaae732728e86a0883097c343c64aec0840fe5 (diff) | |
| parent | 50635e629a8a91690bfd1434e4791a7ecca40f5e (diff) | |
| download | vndk-ab59a9388211e71075c88adcf145f516b5c4006b.tar.gz | |
Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 50635e629atmp_amf_315507370
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2856611
Change-Id: I388a26fa5b2799656d585edd2b37b95fff3b9891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | files/vts_vndk_files_test.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/files/vts_vndk_files_test.py b/files/vts_vndk_files_test.py index 777cd94..1563d24 100644 --- a/files/vts_vndk_files_test.py +++ b/files/vts_vndk_files_test.py @@ -133,6 +133,13 @@ class VtsVndkFilesTest(unittest.TestCase): if not vndk_utils.IsVndkRequired(self._dut): logging.info("Skip the test as the device does not require VNDK.") return + try: + if int(self._vndk_version) > 34: + logging.info("Skip the test as VNDK %s should be installed in " + "vendor partition.", self._vndk_version) + return + except ValueError: + pass self._TestVndkDirectory( vndk_utils.GetVndkDirectory(bitness, self._vndk_version), (vndk_data.VNDK, vndk_data.VNDK_PRIVATE, vndk_data.VNDK_SP, |