diff options
| author | Howard Chen <howardsoc@google.com> | 2019-09-10 01:35:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-10 01:35:06 +0000 |
| commit | 2d210a8d93e1c7bff5b094d03badec87f089bdc2 (patch) | |
| tree | 0dbde7e835dd53dbdffa32751e1b200dfdc9ceb6 /tests | |
| parent | cb27dbd7b049d17554f5ed79b18a195e324a0951 (diff) | |
| parent | 0ef6dde3df71f6b1a171a9516e140f0ddbc60d74 (diff) | |
| download | gsid-2d210a8d93e1c7bff5b094d03badec87f089bdc2.tar.gz | |
Merge "Add test to ReadFstabFromDt in the VtsGsiBootTest"
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) { |