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

Commit d8d3cf5a authored by Nikita Ioffe's avatar Nikita Ioffe Committed by android-build-merger
Browse files

Merge "Fixed fs_mgr#fs_mgr_read_fstab_file_proc_mounts test" am: 6b9971c5

am: 33b8e4c0

Change-Id: I8e6633c9e36b95313145669b3012cedba572dbc0
parents afae2143 33b8e4c0
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ TEST(fs_mgr, fs_mgr_read_fstab_file_proc_mounts) {
                {"nodiratime", MS_NODIRATIME},
                {"ro", MS_RDONLY},
                {"rw", 0},
                {"sync", MS_SYNCHRONOUS},
                {"remount", MS_REMOUNT},
                {"bind", MS_BIND},
                {"rec", MS_REC},
@@ -197,7 +198,7 @@ TEST(fs_mgr, fs_mgr_read_fstab_file_proc_mounts) {
        if (!(entry.flags & MS_RDONLY)) {
            fs_options.emplace("rw");
        }
        EXPECT_EQ(mnt_opts, fs_options);
        EXPECT_EQ(mnt_opts, fs_options) << "At line " << i;
        ++i;
    }
    EXPECT_EQ(i, fstab.size());