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

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

Merge "Update vts_fs_test to reflect VSR." am: 1c34ae88 am: 7ca8e270 

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



Change-Id: I67a48e762b2c40786d027ad678c0459f590d4b42
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 00a68cd5 7ca8e270

fs_mgr/tests/vts_fs_test.cpp

+13 −5
Original line number Diff line number Diff line
@@ -66,6 +66,14 @@ TEST(fs, PartitionTypes) { 


    int vsr_level = GetVsrLevel();



    std::vector<std::string> must_be_f2fs;

    if (vsr_level >= __ANDROID_API_T__) {

        must_be_f2fs.emplace_back("/data");

    }

    if (vsr_level >= __ANDROID_API_U__) {

        must_be_f2fs.emplace_back("/metadata");

    }



    for (const auto& entry : fstab) {

        std::string parent_bdev = entry.blk_device;

        while (true) {
@@ -99,15 +107,15 @@ TEST(fs, PartitionTypes) { 
        }



        if (entry.flags & MS_RDONLY) {

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

            if (vsr_level == __ANDROID_API_T__) {

                allowed.emplace_back("f2fs");

            }

            std::vector<std::string> allowed = {"erofs", "ext4", "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;

            if (std::find(must_be_f2fs.begin(), must_be_f2fs.end(), entry.mount_point) !=

                must_be_f2fs.end()) {

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

            }

        }

    }

}