diff options
| author | yikun.yu <yikun.yu@samsung.com> | 2024-02-21 06:04:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-21 06:04:30 +0000 |
| commit | 07e59eed44d73d890f970be0f2d8bb50037caf34 (patch) | |
| tree | 2d18098f82b4440a1f147f73c821fe5c0383c213 | |
| parent | 471169858c0bb3a5af685e4e34f7bf5682bbaed2 (diff) | |
| parent | 858059e4c10afd85ccd370034a7fb61f73375f2b (diff) | |
| download | gsid-07e59eed44d73d890f970be0f2d8bb50037caf34.tar.gz | |
Skip the f2fs check for the automotive devices in Android 13. am: a3e0d50468 am: 858059e4c1
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/2557090
Change-Id: Ic51cce5086c52b5822ca95bc52aa7529d9151131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/boot_tests.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp index 6aeded3..6264843 100644 --- a/tests/boot_tests.cpp +++ b/tests/boot_tests.cpp @@ -35,6 +35,12 @@ using android::hardware::weaver::V1_0::IWeaver; using android::hardware::weaver::V1_0::WeaverConfig; using android::hardware::weaver::V1_0::WeaverStatus; + +static bool IsAutomotiveDevice() { + auto hw_type = android::base::GetProperty("ro.hardware.type", ""); + return hw_type == "automotive"; +} + TEST(MetadataPartition, FirstStageMount) { Fstab fstab; if (ReadFstabFromDt(&fstab)) { @@ -85,7 +91,7 @@ TEST(Weaver, MinimumSlots) { } TEST(MetadataPartition, FsType) { - if (GetVsrLevel() < __ANDROID_API_T__) { + if (GetVsrLevel() < __ANDROID_API_T__ || IsAutomotiveDevice()) { GTEST_SKIP(); } |