diff options
| author | Hsin-Yi Chen <hsinyichen@google.com> | 2023-12-12 02:58:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-12 02:58:57 +0000 |
| commit | 32a0d8374b40287e86143a98de9af66ed8a217da (patch) | |
| tree | 85b0afc96e8fd191af446205a19d504480376038 | |
| parent | 432602aa51bde21e65e23aa73c43cbbac752029b (diff) | |
| parent | e3c902f8ac749dec4af49595cce8d68d2c258919 (diff) | |
| download | vndk-32a0d8374b40287e86143a98de9af66ed8a217da.tar.gz | |
Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 0f905a05c1 am: e3c902f8ac
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227
Change-Id: I1ce765fe1080f5c70aee1ec2c81afe0795f23e9b
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 faa3e6a..99f8598 100644 --- a/files/vts_vndk_files_test.py +++ b/files/vts_vndk_files_test.py @@ -130,6 +130,13 @@ class VtsVndkFilesTest(unittest.TestCase): logging.info("Skip the test as VNDK runtime is not enforced on " "the device.") 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, |