diff options
author | Tao Bao <tbao@google.com> | 2017-05-03 01:42:27 +0200 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-03 01:42:28 +0200 |
commit | fe7eecff4c0036dd387aab18b3aec4b754ceef96 (patch) | |
tree | 8e47eb4eab95da0b23a2372f1af34c2f932e9905 /tests/component | |
parent | Merge "recovery: Change install_package() to take std::string." (diff) | |
parent | Move sysMapFile and sysReleaseMap into MemMapping class. (diff) | |
download | android_bootable_recovery-fe7eecff4c0036dd387aab18b3aec4b754ceef96.tar android_bootable_recovery-fe7eecff4c0036dd387aab18b3aec4b754ceef96.tar.gz android_bootable_recovery-fe7eecff4c0036dd387aab18b3aec4b754ceef96.tar.bz2 android_bootable_recovery-fe7eecff4c0036dd387aab18b3aec4b754ceef96.tar.lz android_bootable_recovery-fe7eecff4c0036dd387aab18b3aec4b754ceef96.tar.xz android_bootable_recovery-fe7eecff4c0036dd387aab18b3aec4b754ceef96.tar.zst android_bootable_recovery-fe7eecff4c0036dd387aab18b3aec4b754ceef96.zip |
Diffstat (limited to 'tests/component')
-rw-r--r-- | tests/component/updater_test.cpp | 4 | ||||
-rw-r--r-- | tests/component/verifier_test.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp index dc4b5d724..35e87fd56 100644 --- a/tests/component/updater_test.cpp +++ b/tests/component/updater_test.cpp @@ -570,7 +570,7 @@ TEST_F(UpdaterTest, block_image_update) { ASSERT_EQ(0, fclose(zip_file_ptr)); MemMapping map; - ASSERT_EQ(0, sysMapFile(zip_file.path, &map)); + ASSERT_TRUE(map.MapFile(zip_file.path)); ZipArchiveHandle handle; ASSERT_EQ(0, OpenArchiveFromMemory(map.addr, map.length, zip_file.path, &handle)); @@ -646,7 +646,7 @@ TEST_F(UpdaterTest, new_data_short_write) { ASSERT_EQ(0, fclose(zip_file_ptr)); MemMapping map; - ASSERT_EQ(0, sysMapFile(zip_file.path, &map)); + ASSERT_TRUE(map.MapFile(zip_file.path)); ZipArchiveHandle handle; ASSERT_EQ(0, OpenArchiveFromMemory(map.addr, map.length, zip_file.path, &handle)); diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp index 2cfb6d301..5338f05c6 100644 --- a/tests/component/verifier_test.cpp +++ b/tests/component/verifier_test.cpp @@ -38,7 +38,7 @@ class VerifierTest : public testing::TestWithParam<std::vector<std::string>> { void SetUp() override { std::vector<std::string> args = GetParam(); std::string package = from_testdata_base(args[0]); - if (sysMapFile(package.c_str(), &memmap) != 0) { + if (!memmap.MapFile(package)) { FAIL() << "Failed to mmap " << package << ": " << strerror(errno) << "\n"; } |