Snap for 5782352 from 4d267077aa2a169b410185b1a5f5a78212fb4745 to qt-qpr1-releaseandroid-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android10-qpr1-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-release

Change-Id: Ie76d55b11763489128a6b4a2de9092a46eda0803

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) {