From 9e1d6f97dfa36a8d221ed99d00da34ecd41775f1 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Mon, 12 Nov 2018 19:08:19 +0000 Subject: Revert "Extract construction of DataBufferLLVM into FileSystem" It broke the lldb sanitizer bots. --- lldb/unittests/Process/minidump/MinidumpParserTest.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'lldb/unittests') diff --git a/lldb/unittests/Process/minidump/MinidumpParserTest.cpp b/lldb/unittests/Process/minidump/MinidumpParserTest.cpp index 57f27d4f6ba..f3f9d572793 100644 --- a/lldb/unittests/Process/minidump/MinidumpParserTest.cpp +++ b/lldb/unittests/Process/minidump/MinidumpParserTest.cpp @@ -15,9 +15,9 @@ #include "Plugins/Process/minidump/RegisterContextMinidump_x86_64.h" #include "TestingSupport/TestUtilities.h" -#include "lldb/Host/FileSystem.h" #include "lldb/Target/MemoryRegionInfo.h" #include "lldb/Utility/ArchSpec.h" +#include "lldb/Utility/DataBufferLLVM.h" #include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/FileSpec.h" #include "llvm/ADT/ArrayRef.h" @@ -37,13 +37,9 @@ using namespace minidump; class MinidumpParserTest : public testing::Test { public: - void SetUp() override { FileSystem::Initialize(); } - - void TearDown() override { FileSystem::Terminate(); } - void SetUpData(const char *minidump_filename) { std::string filename = GetInputFilePath(minidump_filename); - auto BufferPtr = FileSystem::Instance().CreateDataBuffer(filename, -1, 0); + auto BufferPtr = DataBufferLLVM::CreateSliceFromPath(filename, -1, 0); ASSERT_NE(BufferPtr, nullptr); llvm::Optional optional_parser = MinidumpParser::Create(BufferPtr); @@ -57,7 +53,7 @@ public: void InvalidMinidump(const char *minidump_filename, uint64_t load_size) { std::string filename = GetInputFilePath(minidump_filename); auto BufferPtr = - FileSystem::Instance().CreateDataBuffer(filename, load_size, 0); + DataBufferLLVM::CreateSliceFromPath(filename, load_size, 0); ASSERT_NE(BufferPtr, nullptr); llvm::Optional optional_parser = @@ -92,7 +88,7 @@ TEST_F(MinidumpParserTest, GetThreadListNotPadded) { // after the thread count. SetUpData("thread-list-not-padded.dmp"); llvm::ArrayRef thread_list; - + thread_list = parser->GetThreads(); ASSERT_EQ(2UL, thread_list.size()); EXPECT_EQ(0x11223344UL, thread_list[0].thread_id); -- cgit v1.2.3