PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge AOSP android-9.0.0_r3

Browse Source 
Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0

Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
This commit is contained in:
Ethan Yonker
2018-08-24 11:17:39 -05:00
parent 32aef7a2cf 896de5423d
commit 58f2132bc3
208 changed files with 9097 additions and 4512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/dirutil_test.cpp
+11 -53
View File
@@ -26,23 +26,23 @@
TEST(DirUtilTest, create_invalid) {
// Requesting to create an empty dir is invalid.
ASSERT_EQ(-1, dirCreateHierarchy("", 0755, nullptr, false, nullptr));
ASSERT_EQ(-1, mkdir_recursively("", 0755, false, nullptr));
ASSERT_EQ(ENOENT, errno);
// Requesting to strip the name with no slash present.
ASSERT_EQ(-1, dirCreateHierarchy("abc", 0755, nullptr, true, nullptr));
ASSERT_EQ(-1, mkdir_recursively("abc", 0755, true, nullptr));
ASSERT_EQ(ENOENT, errno);
// Creating a dir that already exists.
TemporaryDir td;
ASSERT_EQ(0, dirCreateHierarchy(td.path, 0755, nullptr, false, nullptr));
ASSERT_EQ(0, mkdir_recursively(td.path, 0755, false, nullptr));
// "///" is a valid dir.
ASSERT_EQ(0, dirCreateHierarchy("///", 0755, nullptr, false, nullptr));
ASSERT_EQ(0, mkdir_recursively("///", 0755, false, nullptr));
// Request to create a dir, but a file with the same name already exists.
TemporaryFile tf;
ASSERT_EQ(-1, dirCreateHierarchy(tf.path, 0755, nullptr, false, nullptr));
ASSERT_EQ(-1, mkdir_recursively(tf.path, 0755, false, nullptr));
ASSERT_EQ(ENOTDIR, errno);
}
@@ -51,7 +51,7 @@ TEST(DirUtilTest, create_smoke) {
std::string prefix(td.path);
std::string path = prefix + "/a/b";
constexpr mode_t mode = 0755;
ASSERT_EQ(0, dirCreateHierarchy(path.c_str(), mode, nullptr, false, nullptr));
ASSERT_EQ(0, mkdir_recursively(path, mode, false, nullptr));
// Verify.
struct stat sb;
@@ -69,7 +69,7 @@ TEST(DirUtilTest, create_strip_filename) {
TemporaryDir td;
std::string prefix(td.path);
std::string path = prefix + "/a/b";
ASSERT_EQ(0, dirCreateHierarchy(path.c_str(), 0755, nullptr, true, nullptr));
ASSERT_EQ(0, mkdir_recursively(path, 0755, true, nullptr));
// Verify that "../a" exists but not "../a/b".
struct stat sb;
@@ -83,31 +83,21 @@ TEST(DirUtilTest, create_strip_filename) {
ASSERT_EQ(0, rmdir((prefix + "/a").c_str()));
}
TEST(DirUtilTest, create_mode_and_timestamp) {
TEST(DirUtilTest, create_mode) {
TemporaryDir td;
std::string prefix(td.path);
std::string path = prefix + "/a/b";
// Set the timestamp to 8/1/2008.
constexpr struct utimbuf timestamp = { 1217592000, 1217592000 };
constexpr mode_t mode = 0751;
ASSERT_EQ(0, dirCreateHierarchy(path.c_str(), mode, &timestamp, false, nullptr));
ASSERT_EQ(0, mkdir_recursively(path, mode, false, nullptr));
// Verify the mode and timestamp for "../a/b".
// Verify the mode for "../a/b".
struct stat sb;
ASSERT_EQ(0, stat(path.c_str(), &sb)) << strerror(errno);
ASSERT_TRUE(S_ISDIR(sb.st_mode));
constexpr mode_t mask = S_IRWXU | S_IRWXG | S_IRWXO;
ASSERT_EQ(mode, sb.st_mode & mask);
timespec time;
time.tv_sec = 1217592000;
time.tv_nsec = 0;
ASSERT_EQ(time.tv_sec, static_cast<long>(sb.st_atime));
ASSERT_EQ(time.tv_sec, static_cast<long>(sb.st_mtime));
// Verify the mode for "../a". Note that the timestamp for intermediate directories (e.g. "../a")
// may not be 'timestamp' according to the current implementation.
// Verify the mode for "../a".
ASSERT_EQ(0, stat((prefix + "/a").c_str(), &sb)) << strerror(errno);
ASSERT_TRUE(S_ISDIR(sb.st_mode));
ASSERT_EQ(mode, sb.st_mode & mask);
@@ -116,35 +106,3 @@ TEST(DirUtilTest, create_mode_and_timestamp) {
ASSERT_EQ(0, rmdir((prefix + "/a/b").c_str()));
ASSERT_EQ(0, rmdir((prefix + "/a").c_str()));
}
TEST(DirUtilTest, unlink_invalid) {
// File doesn't exist.
ASSERT_EQ(-1, dirUnlinkHierarchy("doesntexist"));
// Nonexistent directory.
TemporaryDir td;
std::string path(td.path);
ASSERT_EQ(-1, dirUnlinkHierarchy((path + "/a").c_str()));
ASSERT_EQ(ENOENT, errno);
}
TEST(DirUtilTest, unlink_smoke) {
// Unlink a file.
TemporaryFile tf;
ASSERT_EQ(0, dirUnlinkHierarchy(tf.path));
ASSERT_EQ(-1, access(tf.path, F_OK));
TemporaryDir td;
std::string path(td.path);
constexpr mode_t mode = 0700;
ASSERT_EQ(0, mkdir((path + "/a").c_str(), mode));
ASSERT_EQ(0, mkdir((path + "/a/b").c_str(), mode));
ASSERT_EQ(0, mkdir((path + "/a/b/c").c_str(), mode));
ASSERT_EQ(0, mkdir((path + "/a/d").c_str(), mode));
// Remove "../a" recursively.
ASSERT_EQ(0, dirUnlinkHierarchy((path + "/a").c_str()));
// Verify it's gone.
ASSERT_EQ(-1, access((path + "/a").c_str(), F_OK));
}
tests/unit/rangeset_test.cpp
+190 -13
View File
@@ -17,11 +17,23 @@
#include <signal.h>
#include <sys/types.h>
#include <limits>
#include <vector>
#include <gtest/gtest.h>
#include "updater/rangeset.h"
#include "otautil/rangeset.h"
TEST(RangeSetTest, ctor) {
RangeSet rs(std::vector<Range>{ Range{ 8, 10 }, Range{ 1, 5 } });
ASSERT_TRUE(rs);
RangeSet rs2(std::vector<Range>{});
ASSERT_FALSE(rs2);
RangeSet rs3(std::vector<Range>{ Range{ 8, 10 }, Range{ 5, 1 } });
ASSERT_FALSE(rs3);
}
TEST(RangeSetTest, Parse_smoke) {
RangeSet rs = RangeSet::Parse("2,1,10");
@@ -37,27 +49,64 @@ TEST(RangeSetTest, Parse_smoke) {
// Leading zeros are fine. But android::base::ParseUint() doesn't like trailing zeros like "10 ".
ASSERT_EQ(rs, RangeSet::Parse(" 2, 1, 10"));
ASSERT_EXIT(RangeSet::Parse("2,1,10 "), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_FALSE(RangeSet::Parse("2,1,10 "));
}
TEST(RangeSetTest, Parse_InvalidCases) {
// Insufficient number of tokens.
ASSERT_EXIT(RangeSet::Parse(""), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_EXIT(RangeSet::Parse("2,1"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_FALSE(RangeSet::Parse(""));
ASSERT_FALSE(RangeSet::Parse("2,1"));
// The first token (i.e. the number of following tokens) is invalid.
ASSERT_EXIT(RangeSet::Parse("a,1,1"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_EXIT(RangeSet::Parse("3,1,1"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_EXIT(RangeSet::Parse("-3,1,1"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_EXIT(RangeSet::Parse("2,1,2,3"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_FALSE(RangeSet::Parse("a,1,1"));
ASSERT_FALSE(RangeSet::Parse("3,1,1"));
ASSERT_FALSE(RangeSet::Parse("-3,1,1"));
ASSERT_FALSE(RangeSet::Parse("2,1,2,3"));
// Invalid tokens.
ASSERT_EXIT(RangeSet::Parse("2,1,10a"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_EXIT(RangeSet::Parse("2,,10"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_FALSE(RangeSet::Parse("2,1,10a"));
ASSERT_FALSE(RangeSet::Parse("2,,10"));
// Empty or negative range.
ASSERT_EXIT(RangeSet::Parse("2,2,2"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_EXIT(RangeSet::Parse("2,2,1"), ::testing::KilledBySignal(SIGABRT), "");
ASSERT_FALSE(RangeSet::Parse("2,2,2"));
ASSERT_FALSE(RangeSet::Parse("2,2,1"));
}
TEST(RangeSetTest, Clear) {
RangeSet rs = RangeSet::Parse("2,1,6");
ASSERT_TRUE(rs);
rs.Clear();
ASSERT_FALSE(rs);
// No-op to clear an empty RangeSet.
rs.Clear();
ASSERT_FALSE(rs);
}
TEST(RangeSetTest, PushBack) {
RangeSet rs;
ASSERT_FALSE(rs);
ASSERT_TRUE(rs.PushBack({ 3, 5 }));
ASSERT_EQ(RangeSet::Parse("2,3,5"), rs);
ASSERT_TRUE(rs.PushBack({ 5, 15 }));
ASSERT_EQ(RangeSet::Parse("4,3,5,5,15"), rs);
ASSERT_EQ(static_cast<size_t>(2), rs.size());
ASSERT_EQ(static_cast<size_t>(12), rs.blocks());
}
TEST(RangeSetTest, PushBack_InvalidInput) {
RangeSet rs;
ASSERT_FALSE(rs);
ASSERT_FALSE(rs.PushBack({ 5, 3 }));
ASSERT_FALSE(rs);
ASSERT_FALSE(rs.PushBack({ 15, 15 }));
ASSERT_FALSE(rs);
ASSERT_TRUE(rs.PushBack({ 5, 15 }));
ASSERT_FALSE(rs.PushBack({ 5, std::numeric_limits<size_t>::max() - 2 }));
ASSERT_EQ(RangeSet::Parse("2,5,15"), rs);
}
TEST(RangeSetTest, Overlaps) {
@@ -74,6 +123,86 @@ TEST(RangeSetTest, Overlaps) {
ASSERT_FALSE(RangeSet::Parse("2,5,7").Overlaps(RangeSet::Parse("2,3,5")));
}
TEST(RangeSetTest, Split) {
RangeSet rs1 = RangeSet::Parse("2,1,2");
ASSERT_TRUE(rs1);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("2,1,2") }), rs1.Split(1));
RangeSet rs2 = RangeSet::Parse("2,5,10");
ASSERT_TRUE(rs2);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("2,5,8"), RangeSet::Parse("2,8,10") }),
rs2.Split(2));
RangeSet rs3 = RangeSet::Parse("4,0,1,5,10");
ASSERT_TRUE(rs3);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("4,0,1,5,7"), RangeSet::Parse("2,7,10") }),
rs3.Split(2));
RangeSet rs4 = RangeSet::Parse("6,1,3,3,4,4,5");
ASSERT_TRUE(rs4);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("2,1,3"), RangeSet::Parse("2,3,4"),
RangeSet::Parse("2,4,5") }),
rs4.Split(3));
RangeSet rs5 = RangeSet::Parse("2,0,10");
ASSERT_TRUE(rs5);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("2,0,3"), RangeSet::Parse("2,3,6"),
RangeSet::Parse("2,6,8"), RangeSet::Parse("2,8,10") }),
rs5.Split(4));
RangeSet rs6 = RangeSet::Parse(
"20,0,268,269,271,286,447,8350,32770,33022,98306,98558,163842,164094,196609,204800,229378,"
"229630,294914,295166,457564");
ASSERT_TRUE(rs6);
size_t rs6_blocks = rs6.blocks();
auto splits = rs6.Split(4);
ASSERT_EQ(
(std::vector<RangeSet>{
RangeSet::Parse("12,0,268,269,271,286,447,8350,32770,33022,98306,98558,118472"),
RangeSet::Parse("8,118472,163842,164094,196609,204800,229378,229630,237216"),
RangeSet::Parse("4,237216,294914,295166,347516"), RangeSet::Parse("2,347516,457564") }),
splits);
size_t sum = 0;
for (const auto& element : splits) {
sum += element.blocks();
}
ASSERT_EQ(rs6_blocks, sum);
}
TEST(RangeSetTest, Split_EdgeCases) {
// Empty RangeSet.
RangeSet rs1;
ASSERT_FALSE(rs1);
ASSERT_EQ((std::vector<RangeSet>{}), rs1.Split(2));
ASSERT_FALSE(rs1);
// Zero group.
RangeSet rs2 = RangeSet::Parse("2,1,5");
ASSERT_TRUE(rs2);
ASSERT_EQ((std::vector<RangeSet>{}), rs2.Split(0));
// The number of blocks equals to the number of groups.
RangeSet rs3 = RangeSet::Parse("2,1,5");
ASSERT_TRUE(rs3);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("2,1,2"), RangeSet::Parse("2,2,3"),
RangeSet::Parse("2,3,4"), RangeSet::Parse("2,4,5") }),
rs3.Split(4));
// Less blocks than the number of groups.
RangeSet rs4 = RangeSet::Parse("2,1,5");
ASSERT_TRUE(rs4);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("2,1,2"), RangeSet::Parse("2,2,3"),
RangeSet::Parse("2,3,4"), RangeSet::Parse("2,4,5") }),
rs4.Split(8));
// Less blocks than the number of groups.
RangeSet rs5 = RangeSet::Parse("2,0,3");
ASSERT_TRUE(rs5);
ASSERT_EQ((std::vector<RangeSet>{ RangeSet::Parse("2,0,1"), RangeSet::Parse("2,1,2"),
RangeSet::Parse("2,2,3") }),
rs5.Split(4));
}
TEST(RangeSetTest, GetBlockNumber) {
RangeSet rs = RangeSet::Parse("2,1,10");
ASSERT_EQ(static_cast<size_t>(1), rs.GetBlockNumber(0));
@@ -90,7 +219,7 @@ TEST(RangeSetTest, equality) {
ASSERT_NE(RangeSet::Parse("2,1,6"), RangeSet::Parse("2,1,7"));
ASSERT_NE(RangeSet::Parse("2,1,6"), RangeSet::Parse("2,2,7"));
// The orders of Range's matter. "4,1,5,8,10" != "4,8,10,1,5".
// The orders of Range's matter, e.g. "4,1,5,8,10" != "4,8,10,1,5".
ASSERT_NE(RangeSet::Parse("4,1,5,8,10"), RangeSet::Parse("4,8,10,1,5"));
}
@@ -110,3 +239,51 @@ TEST(RangeSetTest, iterators) {
}
ASSERT_EQ((std::vector<Range>{ Range{ 8, 10 }, Range{ 1, 5 } }), ranges);
}
TEST(RangeSetTest, ToString) {
ASSERT_EQ("", RangeSet::Parse("").ToString());
ASSERT_EQ("2,1,6", RangeSet::Parse("2,1,6").ToString());
ASSERT_EQ("4,1,5,8,10", RangeSet::Parse("4,1,5,8,10").ToString());
ASSERT_EQ("6,1,3,4,6,15,22", RangeSet::Parse("6,1,3,4,6,15,22").ToString());
}
TEST(SortedRangeSetTest, Insert) {
SortedRangeSet rs({ { 2, 3 }, { 4, 6 }, { 8, 14 } });
rs.Insert({ 1, 2 });
ASSERT_EQ(SortedRangeSet({ { 1, 3 }, { 4, 6 }, { 8, 14 } }), rs);
ASSERT_EQ(static_cast<size_t>(10), rs.blocks());
rs.Insert({ 3, 5 });
ASSERT_EQ(SortedRangeSet({ { 1, 6 }, { 8, 14 } }), rs);
ASSERT_EQ(static_cast<size_t>(11), rs.blocks());
SortedRangeSet r1({ { 20, 22 }, { 15, 18 } });
rs.Insert(r1);
ASSERT_EQ(SortedRangeSet({ { 1, 6 }, { 8, 14 }, { 15, 18 }, { 20, 22 } }), rs);
ASSERT_EQ(static_cast<size_t>(16), rs.blocks());
SortedRangeSet r2({ { 2, 7 }, { 15, 21 }, { 20, 25 } });
rs.Insert(r2);
ASSERT_EQ(SortedRangeSet({ { 1, 7 }, { 8, 14 }, { 15, 25 } }), rs);
ASSERT_EQ(static_cast<size_t>(22), rs.blocks());
}
TEST(SortedRangeSetTest, file_range) {
SortedRangeSet rs;
rs.Insert(4096, 4096);
ASSERT_EQ(SortedRangeSet({ { 1, 2 } }), rs);
// insert block 2-9
rs.Insert(4096 * 3 - 1, 4096 * 7);
ASSERT_EQ(SortedRangeSet({ { 1, 10 } }), rs);
// insert block 15-19
rs.Insert(4096 * 15 + 1, 4096 * 4);
ASSERT_EQ(SortedRangeSet({ { 1, 10 }, { 15, 20 } }), rs);
// rs overlaps block 2-2
ASSERT_TRUE(rs.Overlaps(4096 * 2 - 1, 10));
ASSERT_FALSE(rs.Overlaps(4096 * 10, 4096 * 5));
ASSERT_EQ(static_cast<size_t>(10), rs.GetOffsetInRangeSet(4106));
ASSERT_EQ(static_cast<size_t>(40970), rs.GetOffsetInRangeSet(4096 * 16 + 10));
// block#10 not in range.
ASSERT_EXIT(rs.GetOffsetInRangeSet(40970), ::testing::KilledBySignal(SIGABRT), "");
}