summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Chen <howardsoc@google.com>2019-07-31 17:52:16 +0800
committerHoward Chen <howardsoc@google.com>2019-08-01 16:04:57 +0800
commit2ebc255d002cfae27771cd6a6400790c09441a45 (patch)
tree54b0313105d531de45e5ed94a70317b063097662
parentb294e22684954938075171d0401b82c1fc90a497 (diff)
downloadgsid-2ebc255d002cfae27771cd6a6400790c09441a45.tar.gz
Add test to ReadFstabFromDt in the VtsGsiBootTest
This test is added to address the init behavior in first_stage_mount in order to make sure /metadata can be early mounted on devices that still use dt-fstab. Bug: 138449350 Test: vts-tradefed> run vts -m VtsGsiBootTest Change-Id: If1c5f037f7850f6237e60f3e0cb19f429a3abebd
-rw-r--r--tests/boot_tests.cpp14
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) {