commit 4d267077aa2a169b410185b1a5f5a78212fb4745
author Howard Chen <howardsoc@google.com> Mon Aug 05 01:22:12 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 05 01:22:12 2019 -0700
tree 54b0313105d531de45e5ed94a70317b063097662
parent 6994872957dd5a4b404804c2e32676c42b9bcb7f
parent 9eda660ff9969e5aba009bf0ffbf7f055806fafe

Add test to ReadFstabFromDt in the VtsGsiBootTest am: 2ebc255d00
am: 9eda660ff9

Change-Id: I1b3ab9e2c9381f00d9fa29ddab6fb7a3582d9e6c

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