commit 09b2fca8f5a6bee46e5b2a3ba2aaa693f8ea3f79
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 06 03:15:00 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 06 03:15:00 2019 +0000
tree 54b0313105d531de45e5ed94a70317b063097662
parent c9e5e8bfba78d97364829f84549d768768140f4c
parent 9eda660ff9969e5aba009bf0ffbf7f055806fafe

Snap for 5781865 from 9eda660ff9969e5aba009bf0ffbf7f055806fafe to qt-c2f2-release

Change-Id: I2e7286b8c5a6ee59410905c1919458eeccff53bf

tests/boot_tests.cpp

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