diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2024-01-22 13:04:25 +0900 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2024-01-22 13:21:00 +0900 |
| commit | c00ca2fa283864b4e28a5548a7035f74ae1e26a6 (patch) | |
| tree | 40cd176a5dce3d720ca0c4626d228f0fd1ebd4a8 | |
| parent | 770d37e5117395a0a251acb48d3b41613c99882c (diff) | |
| download | hal-c00ca2fa283864b4e28a5548a7035f74ae1e26a6.tar.gz | |
Skip VINTF vendor-ndk version tests with VNDK v35
VINTF vendor-ndk version would not be set if VNDK version is 35, but
current test keep checks for any device with VNDK v35. This change skips
version check of VINTF vendor-ndk version if VNDK version is 35.
Bug: 319765938
Test: Test passed with 24Q1 image
Change-Id: I107b9bb88846143c1266685fac73d3129f69b019
| -rw-r--r-- | treble/vintf/DeviceMatrixTest.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/treble/vintf/DeviceMatrixTest.cpp b/treble/vintf/DeviceMatrixTest.cpp index 1f9b7121..fa4c2d23 100644 --- a/treble/vintf/DeviceMatrixTest.cpp +++ b/treble/vintf/DeviceMatrixTest.cpp @@ -69,10 +69,16 @@ TEST_F(DeviceMatrixTest, VndkVersion) { ASSERT_LE(syspropVndkVersionNumber, __ANDROID_API_V__) << kVndkVersionProp << " must be less or equal than " << __ANDROID_API_V__; + + if (syspropVndkVersionNumber == __ANDROID_API_V__) { + GTEST_SKIP() + << "VNDK version 35 may not have matching VINTF VNDK version."; + } } ASSERT_NE("", syspropVndkVersion) << kVndkVersionProp << " must not be empty."; + std::string vintfVndkVersion = vendor_matrix_->getVendorNdkVersion(); ASSERT_NE("", vintfVndkVersion) << "Device compatibility matrix does not declare proper VNDK version."; |