From a3e0d50468f66c4b9276129da056ee232701cce9 Mon Sep 17 00:00:00 2001 From: "yikun.yu" Date: Sun, 23 Apr 2023 17:04:39 +0800 Subject: Skip the f2fs check for the automotive devices in Android 13. In Android 13, f2fs is required for mobile devices, but not required for automotive devices. So skip the f2fs check for automotive devices. Bug: 273385954 Test: vts_gsi_boot_test Change-Id: I8ba7af19e0a32dfeccef1b1451398955f576145b --- tests/boot_tests.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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(); } -- cgit v1.2.3