diff options
| author | Howard Chen <howardsoc@google.com> | 2019-07-31 17:52:16 +0800 |
|---|---|---|
| committer | Howard Chen <howardsoc@google.com> | 2019-09-09 16:58:25 +0800 |
| commit | 0ef6dde3df71f6b1a171a9516e140f0ddbc60d74 (patch) | |
| tree | 2bf63c57064412c4c60710db1aa2d1af658f2ec6 /tests | |
| parent | e1eb268db19ed28baa13a58cae802ad37a30d36e (diff) | |
| download | gsid-0ef6dde3df71f6b1a171a9516e140f0ddbc60d74.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
Merged-In: If1c5f037f7850f6237e60f3e0cb19f429a3abebd
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/boot_tests.cpp | 14 |
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) { |