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

Commit 7179bd1a authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Gerrit Code Review
Browse files

Merge "fiemap_writer_test: add block truncation and sync for safety" into main

parents 7cc50a8c 623682af

fs_mgr/libfiemap/fiemap_writer_test.cpp

+5 −1
Original line number Diff line number Diff line
@@ -66,7 +66,11 @@ class FiemapWriterTest : public ::testing::Test { 
        testfile = gTestDir + "/"s + tinfo->name();

    }



    void TearDown() override { unlink(testfile.c_str()); }

    void TearDown() override {

        truncate(testfile.c_str(), 0);

        unlink(testfile.c_str());

        sync();

    }



    // name of the file we use for testing

    std::string testfile;

fs_mgr/libfiemap/split_fiemap_writer.cpp

+3 −0
Original line number Diff line number Diff line
@@ -196,10 +196,13 @@ bool SplitFiemap::RemoveSplitFiles(const std::string& file_path, std::string* me 
            if (access(file.c_str(), F_OK) != 0 && (errno == ENOENT || errno == ENAMETOOLONG)) {

                continue;

            }

            truncate(file.c_str(), 0);

            ok &= android::base::RemoveFileIfExists(file, message);

        }

    }

    truncate(file_path.c_str(), 0);

    ok &= android::base::RemoveFileIfExists(file_path, message);

    sync();

    return ok;

}