Add test to ReadFstabFromDt in the VtsGsiBootTest am: 2ebc255d00android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releaseandroid10-d4-s1-releaseandroid10-d4-release

am: 9eda660ff9

Change-Id: I1b3ab9e2c9381f00d9fa29ddab6fb7a3582d9e6c

1 files changed, 9 insertions, 5 deletions

diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp
index a8b623d..a00e798 100644
--- a/tests/boot_tests.cpp
+++ b/tests/boot_tests.cpp
@@ -29,11 +29,15 @@ using android::hardware::weaver::V1_0::WeaverStatus;
 
 TEST(MetadataPartition, FirstStageMount) {
     Fstab fstab;
-    ASSERT_TRUE(ReadDefaultFstab(&fstab));
-
-    auto entry = GetEntryForMountPoint(&fstab, "/metadata");
-    ASSERT_NE(entry, nullptr);
-    EXPECT_TRUE(entry->fs_mgr_flags.first_stage_mount);
+    if (ReadFstabFromDt(&fstab)) {
+        auto entry = GetEntryForMountPoint(&fstab, "/metadata");
+        ASSERT_NE(entry, nullptr);
+    } else {
+        ASSERT_TRUE(ReadDefaultFstab(&fstab));
+        auto entry = GetEntryForMountPoint(&fstab, "/metadata");
+        ASSERT_NE(entry, nullptr);
+        EXPECT_TRUE(entry->fs_mgr_flags.first_stage_mount);
+    }
 }
 
 TEST(MetadataPartition, MinimumSize) {