diff options
author | George Karpenkov <ekarpenkov@apple.com> | 2017-08-26 17:50:35 +0000 |
---|---|---|
committer | George Karpenkov <ekarpenkov@apple.com> | 2017-08-26 17:50:35 +0000 |
commit | 422f200cdfd54bee317d925981b24b177bd46297 (patch) | |
tree | 521e9eb77919a11073f2599fa1870977091b2b4f /lib/fuzzer/tests | |
parent | 740573d1259e500ea7f323d213d476784c305372 (diff) |
Revert "[libFuzzer] Use custom allocators for STL containers in libFuzzer"
This reverts commit 3539efc2f2218dba2bcbd645d0fe276f2b5cf588.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@311831 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/fuzzer/tests')
-rw-r--r-- | lib/fuzzer/tests/FuzzerUnittest.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/fuzzer/tests/FuzzerUnittest.cpp b/lib/fuzzer/tests/FuzzerUnittest.cpp index feafc8ffd..858e61d75 100644 --- a/lib/fuzzer/tests/FuzzerUnittest.cpp +++ b/lib/fuzzer/tests/FuzzerUnittest.cpp @@ -526,7 +526,7 @@ TEST(FuzzerDictionary, ParseOneDictionaryEntry) { } TEST(FuzzerDictionary, ParseDictionaryFile) { - fuzzer::vector<Unit> Units; + std::vector<Unit> Units; EXPECT_FALSE(ParseDictionaryFile("zzz\n", &Units)); EXPECT_FALSE(ParseDictionaryFile("", &Units)); EXPECT_TRUE(ParseDictionaryFile("\n", &Units)); @@ -538,11 +538,11 @@ TEST(FuzzerDictionary, ParseDictionaryFile) { EXPECT_TRUE(ParseDictionaryFile(" #zzzz\n", &Units)); EXPECT_EQ(Units.size(), 0U); EXPECT_TRUE(ParseDictionaryFile(" #zzzz\naaa=\"aa\"", &Units)); - EXPECT_EQ(Units, fuzzer::vector<Unit>({Unit({'a', 'a'})})); + EXPECT_EQ(Units, std::vector<Unit>({Unit({'a', 'a'})})); EXPECT_TRUE( ParseDictionaryFile(" #zzzz\naaa=\"aa\"\n\nabc=\"abc\"", &Units)); EXPECT_EQ(Units, - fuzzer::vector<Unit>({Unit({'a', 'a'}), Unit({'a', 'b', 'c'})})); + std::vector<Unit>({Unit({'a', 'a'}), Unit({'a', 'b', 'c'})})); } TEST(FuzzerUtil, Base64) { @@ -566,7 +566,7 @@ TEST(Corpus, Distribution) { for (size_t i = 0; i < N; i++) C->AddToCorpus(Unit{ static_cast<uint8_t>(i) }, 1, false, {}); - fuzzer::vector<size_t> Hist(N); + std::vector<size_t> Hist(N); for (size_t i = 0; i < N * TriesPerUnit; i++) { Hist[C->ChooseUnitIdxToMutate(Rand)]++; } @@ -596,21 +596,21 @@ TEST(Merge, Bad) { } } -void EQ(const fuzzer::vector<uint32_t> &A, const fuzzer::vector<uint32_t> &B) { +void EQ(const std::vector<uint32_t> &A, const std::vector<uint32_t> &B) { EXPECT_EQ(A, B); } -void EQ(const fuzzer::vector<std::string> &A, const fuzzer::vector<std::string> &B) { +void EQ(const std::vector<std::string> &A, const std::vector<std::string> &B) { std::set<std::string> a(A.begin(), A.end()); std::set<std::string> b(B.begin(), B.end()); EXPECT_EQ(a, b); } static void Merge(const std::string &Input, - const fuzzer::vector<std::string> Result, + const std::vector<std::string> Result, size_t NumNewFeatures) { Merger M; - fuzzer::vector<std::string> NewFiles; + std::vector<std::string> NewFiles; EXPECT_TRUE(M.Parse(Input, true)); std::stringstream SS; M.PrintSummary(SS); @@ -658,7 +658,7 @@ TEST(Merge, Good) { EQ(M.Files[1].Features, {4, 5, 6}); - fuzzer::vector<std::string> NewFiles; + std::vector<std::string> NewFiles; EXPECT_TRUE(M.Parse("3\n2\nAA\nBB\nC\n" "STARTED 0 1000\nDONE 0 1 2 3\n" @@ -739,7 +739,7 @@ TEST(Fuzzer, ForEachNonZeroByte) { 0, 0, 0, 0, 0, 0, 0, 8, 9, 9, 9, 9, 9, 9, 9, 9, }; - typedef fuzzer::vector<std::pair<size_t, uint8_t> > Vec; + typedef std::vector<std::pair<size_t, uint8_t> > Vec; Vec Res, Expected; auto CB = [&](size_t FirstFeature, size_t Idx, uint8_t V) { Res.push_back({FirstFeature + Idx, V}); |