diff options
| author | Yifan Hong <elsk@google.com> | 2023-06-21 18:34:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-21 18:34:52 +0000 |
| commit | 9e87e65bd0ecab4220949633c368e77d106ed810 (patch) | |
| tree | 77cec1855caf18bd6913ccd0da6f3dd08c360fcd | |
| parent | 411c2c5829f405d84ec9e092ab78780cec3d1ec6 (diff) | |
| parent | 8480451e2d15de91213219311df5e98795d01491 (diff) | |
| download | hal-9e87e65bd0ecab4220949633c368e77d106ed810.tar.gz | |
[DO NOT MERGE] Delete kernel_fcm_version >= target_fcm_version requirement. am: 8bf02ef58b am: 8480451e2d
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/2631350
Change-Id: Id90d4c944f8b437844d4084e4d8fe750bbd88581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | treble/vintf/DeviceManifestTest.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/treble/vintf/DeviceManifestTest.cpp b/treble/vintf/DeviceManifestTest.cpp index 9a655fe3..eec781e3 100644 --- a/treble/vintf/DeviceManifestTest.cpp +++ b/treble/vintf/DeviceManifestTest.cpp @@ -44,28 +44,6 @@ TEST_F(DeviceManifestTest, ShippingFcmVersion) { ASSERT_RESULT_OK(res); } -TEST_F(DeviceManifestTest, KernelFcmVersion) { - const char* kHeader = - "Kernel FCM version (specified in VINTF manifests with <kernel " - "target-level=\"[0-9]+\"/> if not by /proc/version) "; - Level shipping_fcm_version = VintfObject::GetDeviceHalManifest()->level(); - - if (shipping_fcm_version == Level::UNSPECIFIED || - shipping_fcm_version < Level::R) { - GTEST_SKIP() << kHeader << " not enforced on target FCM version " - << shipping_fcm_version; - } - std::string error; - Level kernel_fcm_version = VintfObject::GetInstance()->getKernelLevel(&error); - ASSERT_NE(Level::UNSPECIFIED, kernel_fcm_version) - << kHeader << " must be specified for target FCM version '" - << shipping_fcm_version << "': " << error; - ASSERT_GE(kernel_fcm_version, shipping_fcm_version) - << kHeader << " is " << kernel_fcm_version - << ", but it must be greater or equal to target FCM version " - << shipping_fcm_version; -} - // Tests that deprecated HALs are not in the manifest, unless a higher, // non-deprecated minor version is in the manifest. TEST_F(DeviceManifestTest, NoDeprecatedHalsOnManifest) { |