diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-07-01 13:24:58 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-07-01 13:24:58 +0000 |
| commit | 1b306c26ade71504511d2fa75b03dfaee77f9620 (patch) | |
| tree | 2c4c77af2ba9632c24ebf216b9a39989d74f5725 /unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp | |
| parent | fdea456ad833fbab0d3a296a58250950f11a498c (diff) | |
| download | src-1b306c26ade71504511d2fa75b03dfaee77f9620.tar.gz src-1b306c26ade71504511d2fa75b03dfaee77f9620.zip | |
Vendor import of lldb trunk r306956:vendor/lldb/lldb-trunk-r306956
Notes
Notes:
svn path=/vendor/lldb/dist/; revision=320543
svn path=/vendor/lldb/lldb-trunk-r306956/; revision=320544; tag=vendor/lldb/lldb-trunk-r306956
Diffstat (limited to 'unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp')
| -rw-r--r-- | unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp b/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp index 226057f89369..0e63a4104234 100644 --- a/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp +++ b/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp @@ -15,6 +15,9 @@ #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" +#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h" +#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h" +#include "Plugins/SymbolFile/PDB/SymbolFilePDB.h" #include "lldb/Core/Address.h" #include "lldb/Core/ArchSpec.h" #include "lldb/Core/Module.h" @@ -25,10 +28,7 @@ #include "lldb/Symbol/LineTable.h" #include "lldb/Symbol/SymbolVendor.h" #include "lldb/Utility/FileSpec.h" - -#include "Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h" -#include "Plugins/SymbolFile/DWARF/SymbolFileDWARF.h" -#include "Plugins/SymbolFile/PDB/SymbolFilePDB.h" +#include "unittests/Utility/Helpers/TestUtilities.h" #if defined(_MSC_VER) #include "lldb/Host/windows/windows.h" @@ -37,8 +37,6 @@ #include <algorithm> -extern const char *TestMainArgv0; - using namespace lldb_private; class SymbolFilePDBTests : public testing::Test { @@ -57,14 +55,8 @@ public: ClangASTContext::Initialize(); SymbolFilePDB::Initialize(); - llvm::StringRef exe_folder = llvm::sys::path::parent_path(TestMainArgv0); - llvm::SmallString<128> inputs_folder = exe_folder; - llvm::sys::path::append(inputs_folder, "Inputs"); - - m_pdb_test_exe = inputs_folder; - m_types_test_exe = inputs_folder; - llvm::sys::path::append(m_pdb_test_exe, "test-pdb.exe"); - llvm::sys::path::append(m_types_test_exe, "test-pdb-types.exe"); + m_pdb_test_exe = GetInputFilePath("test-pdb.exe"); + m_types_test_exe = GetInputFilePath("test-pdb-types.exe"); } void TearDown() override { @@ -80,8 +72,8 @@ public: } protected: - llvm::SmallString<128> m_pdb_test_exe; - llvm::SmallString<128> m_types_test_exe; + std::string m_pdb_test_exe; + std::string m_types_test_exe; bool FileSpecMatchesAsBaseOrFull(const FileSpec &left, const FileSpec &right) const { |