summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHsin-Yi Chen <hsinyichen@google.com>2023-12-12 02:57:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-12 02:57:03 +0000
commit226d2c64e41a1f8ae656163d5726e0460a25ca4c (patch)
tree85b0afc96e8fd191af446205a19d504480376038
parente6a08c31aa9b0937f8dbbd32e1a8a1a42900e54b (diff)
parente3c902f8ac749dec4af49595cce8d68d2c258919 (diff)
downloadvndk-226d2c64e41a1f8ae656163d5726e0460a25ca4c.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: I1f5694a1225a2ce7dc9cd752ca137af5a4d2a414 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--files/vts_vndk_files_test.py7
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,