diff options
Diffstat (limited to 'unittests/Support')
-rw-r--r-- | unittests/Support/CachePruningTest.cpp | 4 | ||||
-rw-r--r-- | unittests/Support/MemoryBufferTest.cpp | 40 | ||||
-rw-r--r-- | unittests/Support/TargetParserTest.cpp | 6 | ||||
-rw-r--r-- | unittests/Support/YAMLIOTest.cpp | 107 |
4 files changed, 69 insertions, 88 deletions
diff --git a/unittests/Support/CachePruningTest.cpp b/unittests/Support/CachePruningTest.cpp index 1bb57871925c2..4bc2ad19ba437 100644 --- a/unittests/Support/CachePruningTest.cpp +++ b/unittests/Support/CachePruningTest.cpp @@ -27,10 +27,10 @@ TEST(CachePruningPolicyParser, Interval) { EXPECT_EQ(std::chrono::seconds(1), P->Interval); P = parseCachePruningPolicy("prune_interval=2m"); ASSERT_TRUE(bool(P)); - EXPECT_EQ(std::chrono::minutes(2), P->Interval); + EXPECT_EQ(std::chrono::minutes(2), *P->Interval); P = parseCachePruningPolicy("prune_interval=3h"); ASSERT_TRUE(bool(P)); - EXPECT_EQ(std::chrono::hours(3), P->Interval); + EXPECT_EQ(std::chrono::hours(3), *P->Interval); } TEST(CachePruningPolicyParser, Expiration) { diff --git a/unittests/Support/MemoryBufferTest.cpp b/unittests/Support/MemoryBufferTest.cpp index 294581aeb928d..5e3c8db02791d 100644 --- a/unittests/Support/MemoryBufferTest.cpp +++ b/unittests/Support/MemoryBufferTest.cpp @@ -15,6 +15,7 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/FileUtilities.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Testing/Support/Error.h" #include "gtest/gtest.h" using namespace llvm; @@ -103,15 +104,15 @@ TEST_F(MemoryBufferTest, copy) { TEST_F(MemoryBufferTest, make_new) { // 0-sized buffer - OwningBuffer Zero(MemoryBuffer::getNewUninitMemBuffer(0)); + OwningBuffer Zero(WritableMemoryBuffer::getNewUninitMemBuffer(0)); EXPECT_TRUE(nullptr != Zero.get()); // uninitialized buffer with no name - OwningBuffer One(MemoryBuffer::getNewUninitMemBuffer(321)); + OwningBuffer One(WritableMemoryBuffer::getNewUninitMemBuffer(321)); EXPECT_TRUE(nullptr != One.get()); // uninitialized buffer with name - OwningBuffer Two(MemoryBuffer::getNewUninitMemBuffer(123, "bla")); + OwningBuffer Two(WritableMemoryBuffer::getNewUninitMemBuffer(123, "bla")); EXPECT_TRUE(nullptr != Two.get()); // 0-initialized buffer with no name @@ -226,4 +227,37 @@ TEST_F(MemoryBufferTest, slice) { EXPECT_TRUE(BufData2.substr(0x1800,8).equals("abcdefgh")); EXPECT_TRUE(BufData2.substr(0x2FF8,8).equals("abcdefgh")); } + +TEST_F(MemoryBufferTest, writableSlice) { + // Create a file initialized with some data + int FD; + SmallString<64> TestPath; + sys::fs::createTemporaryFile("MemoryBufferTest_WritableSlice", "temp", FD, + TestPath); + FileRemover Cleanup(TestPath); + raw_fd_ostream OF(FD, true); + for (unsigned i = 0; i < 0x1000; ++i) + OF << "0123456789abcdef"; + OF.close(); + + { + auto MBOrError = + WritableMemoryBuffer::getFileSlice(TestPath.str(), 0x6000, 0x2000); + ASSERT_FALSE(MBOrError.getError()); + // Write some data. It should be mapped private, so that upon completion + // the original file contents are not modified. + WritableMemoryBuffer &MB = **MBOrError; + ASSERT_EQ(0x6000u, MB.getBufferSize()); + char *Start = MB.getBufferStart(); + ASSERT_EQ(MB.getBufferEnd(), MB.getBufferStart() + MB.getBufferSize()); + ::memset(Start, 'x', MB.getBufferSize()); + } + + auto MBOrError = MemoryBuffer::getFile(TestPath); + ASSERT_FALSE(MBOrError.getError()); + auto &MB = **MBOrError; + ASSERT_EQ(0x10000u, MB.getBufferSize()); + for (size_t i = 0; i < MB.getBufferSize(); i += 0x10) + EXPECT_EQ("0123456789abcdef", MB.getBuffer().substr(i, 0x10)) << "i: " << i; +} } diff --git a/unittests/Support/TargetParserTest.cpp b/unittests/Support/TargetParserTest.cpp index dcef40345f050..48fffca1aa180 100644 --- a/unittests/Support/TargetParserTest.cpp +++ b/unittests/Support/TargetParserTest.cpp @@ -278,6 +278,12 @@ TEST(TargetParserTest, testARMCPU) { "7-S")); } +TEST(TargetParserTest, testInvalidARMArch) { + auto InvalidArchStrings = {"armv", "armv99", "noarm"}; + for (const char* InvalidArch : InvalidArchStrings) + EXPECT_EQ(ARM::parseArch(InvalidArch), ARM::ArchKind::INVALID); +} + bool testARMArch(StringRef Arch, StringRef DefaultCPU, StringRef SubArch, unsigned ArchAttr) { ARM::ArchKind AK = ARM::parseArch(Arch); diff --git a/unittests/Support/YAMLIOTest.cpp b/unittests/Support/YAMLIOTest.cpp index 9caff85a59639..914b22f0fcdf3 100644 --- a/unittests/Support/YAMLIOTest.cpp +++ b/unittests/Support/YAMLIOTest.cpp @@ -7,6 +7,7 @@ // //===----------------------------------------------------------------------===// +#include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" #include "llvm/Support/Casting.h" #include "llvm/Support/Endian.h" @@ -2450,94 +2451,34 @@ TEST(YAMLIO, TestCustomMappingStruct) { EXPECT_EQ(4, y["bar"].bar); } -TEST(YAMLIO, InvalidInput) { - // polluting 1 value in the sequence - Input yin("---\n- foo: 3\n bar: 5\n1\n- foo: 3\n bar: 5\n...\n"); - std::vector<FooBar> Data; - yin >> Data; - EXPECT_TRUE((bool)yin.error()); -} - -TEST(YAMLIO, TestEscapedSingleQuote) { - std::string Id = "@abc@"; - - std::string out; - llvm::raw_string_ostream ostr(out); - Output xout(ostr, nullptr, 0); - - llvm::yaml::EmptyContext Ctx; - yamlize(xout, Id, true, Ctx); - - ostr.flush(); - EXPECT_EQ("'@abc@'", out); -} - -TEST(YAMLIO, TestEscapedNoQuote) { - std::string Id = "abc/"; - - std::string out; - llvm::raw_string_ostream ostr(out); - Output xout(ostr, nullptr, 0); - - llvm::yaml::EmptyContext Ctx; - yamlize(xout, Id, true, Ctx); - - ostr.flush(); - EXPECT_EQ("abc/", out); -} - -TEST(YAMLIO, TestEscapedDoubleQuoteNonPrintable) { - std::string Id = "\01@abc@"; - - std::string out; - llvm::raw_string_ostream ostr(out); - Output xout(ostr, nullptr, 0); - - llvm::yaml::EmptyContext Ctx; - yamlize(xout, Id, true, Ctx); - - ostr.flush(); - EXPECT_EQ("\"\\x01@abc@\"", out); -} - -TEST(YAMLIO, TestEscapedDoubleQuoteInsideSingleQuote) { - std::string Id = "abc\"fdf"; - - std::string out; - llvm::raw_string_ostream ostr(out); - Output xout(ostr, nullptr, 0); - - llvm::yaml::EmptyContext Ctx; - yamlize(xout, Id, true, Ctx); - - ostr.flush(); - EXPECT_EQ("'abc\"fdf'", out); -} - -TEST(YAMLIO, TestEscapedDoubleQuoteInsideDoubleQuote) { - std::string Id = "\01bc\"fdf"; - - std::string out; - llvm::raw_string_ostream ostr(out); - Output xout(ostr, nullptr, 0); - - llvm::yaml::EmptyContext Ctx; - yamlize(xout, Id, true, Ctx); - - ostr.flush(); - EXPECT_EQ("\"\\x01bc\\\"fdf\"", out); -} - -TEST(YAMLIO, TestEscapedSingleQuoteInsideSingleQuote) { - std::string Id = "abc'fdf"; - +static void TestEscaped(llvm::StringRef Input, llvm::StringRef Expected) { std::string out; llvm::raw_string_ostream ostr(out); Output xout(ostr, nullptr, 0); llvm::yaml::EmptyContext Ctx; - yamlize(xout, Id, true, Ctx); + yamlize(xout, Input, true, Ctx); ostr.flush(); - EXPECT_EQ("'abc''fdf'", out); + EXPECT_EQ(Expected, out); +} + +TEST(YAMLIO, TestEscaped) { + // Single quote + TestEscaped("@abc@", "'@abc@'"); + // No quote + TestEscaped("abc/", "abc/"); + // Double quote non-printable + TestEscaped("\01@abc@", "\"\\x01@abc@\""); + // Double quote inside single quote + TestEscaped("abc\"fdf", "'abc\"fdf'"); + // Double quote inside double quote + TestEscaped("\01bc\"fdf", "\"\\x01bc\\\"fdf\""); + // Single quote inside single quote + TestEscaped("abc'fdf", "'abc''fdf'"); + // UTF8 + TestEscaped("/*параметр*/", "\"/*параметр*/\""); + // UTF8 with single quote inside double quote + TestEscaped("parameter 'параметр' is unused", + "\"parameter 'параметр' is unused\""); } |