Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac5172c9 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Relax filesystem requirements in vts_fs_test." into tm-dev am: 0d3b8d55 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/18625783



Change-Id: I381eb347e23d2998217b2152847837086cc671aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f665fa95 0d3b8d55

fs_mgr/tests/vts_fs_test.cpp

+7 −1
Original line number Diff line number Diff line
@@ -94,7 +94,13 @@ TEST(fs, PartitionTypes) { 
        }



        if (entry.flags & MS_RDONLY) {

            EXPECT_EQ(entry.fs_type, "erofs") << entry.mount_point;

            std::vector<std::string> allowed = {"erofs", "ext4"};

            if (vsr_level == __ANDROID_API_T__) {

                allowed.emplace_back("f2fs");

            }



            EXPECT_NE(std::find(allowed.begin(), allowed.end(), entry.fs_type), allowed.end())

                    << entry.mount_point;

        } else {

            EXPECT_NE(entry.fs_type, "ext4") << entry.mount_point;

        }