Author: penryu
Date: Tue Oct 3 14:20:18 2017
New Revision: 314849
URL: http://llvm.org/viewvc/llvm-project?rev=314849&view=rev
Log:
cmake + xcode: prevent gtests from using includes from project root
Summary:
At present, several gtests in the lldb open source codebase are using
#include statements rooted at $(SOURCE_ROOT)/${LLDB_PROJECT_ROOT}.
This patch cleans up this directory/include structure for both CMake and
Xcode build systems.
rdar://problem/33835795
Reviewers: zturner, jingham, beanz
Reviewed By: beanz
Subscribers: emaste, lldb-commits, mgorny
Differential Revision: https://reviews.llvm.org/D36598
Added:
lldb/trunk/unittests/TestingSupport/
lldb/trunk/unittests/TestingSupport/CMakeLists.txt
- copied, changed from r314832,
lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt
lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.cpp
- copied, changed from r314832,
lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp
lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.h
- copied, changed from r314832,
lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h
lldb/trunk/unittests/TestingSupport/TestUtilities.cpp
- copied, changed from r314832,
lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp
lldb/trunk/unittests/TestingSupport/TestUtilities.h
- copied, changed from r314832,
lldb/trunk/unittests/Utility/Helpers/TestUtilities.h
Removed:
lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt
lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp
lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h
lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp
lldb/trunk/unittests/Utility/Helpers/TestUtilities.h
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
lldb/trunk/unittests/CMakeLists.txt
lldb/trunk/unittests/Interpreter/TestCompletion.cpp
lldb/trunk/unittests/ObjectFile/ELF/TestObjectFileELF.cpp
lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp
lldb/trunk/unittests/Symbol/TestDWARFCallFrameInfo.cpp
lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp
lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp
lldb/trunk/unittests/Target/ModuleCacheTest.cpp
lldb/trunk/unittests/Utility/CMakeLists.txt
lldb/trunk/unittests/Utility/StructuredDataTest.cpp
lldb/trunk/unittests/Utility/TildeExpressionResolverTest.cpp
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Tue Oct 3 14:20:18 2017
@@ -876,8 +876,8 @@
966C6B7C18E6A56A0093F5EC /* libz.dylib in Frameworks */ = {isa
= PBXBuildFile; fileRef = 966C6B7818E6A56A0093F5EC /* libz.dylib */; };
9694FA711B32AA64005EBB16 /* ABISysV_mips.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 9694FA6F1B32AA64005EBB16 /* ABISysV_mips.cpp */;
};
9A0FDEA71E8EF5110086B2F5 /* RegisterContextLinux_mips.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 9A0FDE971E8EF5010086B2F5 /*
RegisterContextLinux_mips.cpp */; };
- 9A1542F91F0EE48600DEA1D8 /* MockTildeExpressionResolver.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 9A1542F51F0EE44000DEA1D8 /*
MockTildeExpressionResolver.cpp */; };
- 9A1542FA1F0EE48600DEA1D8 /* TestUtilities.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 9A1542F71F0EE44000DEA1D8 /* TestUtilities.cpp
*/; };
+ 9A18903B1F47D5E600394BCA /* MockTildeExpressionResolver.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 9A1890321F47D5D400394BCA /*
MockTildeExpressionResolver.cpp */; };
+ 9A18903C1F47D5E600394BCA /* TestUtilities.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 9A1890341F47D5D400394BCA /* TestUtilities.cpp
*/; };
9A19A6AF1163BBB200E0D453 /* SBValue.h in Headers */ = {isa =
PBXBuildFile; fileRef = 9A19A6A51163BB7E00E0D453 /* SBValue.h */; settings =
{ATTRIBUTES = (Public, ); }; };
9A19A6B01163BBB300E0D453 /* SBValue.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = 9A19A6AD1163BB9800E0D453 /* SBValue.cpp */; };
9A1E595C1EB2B141002206A5 /* SBTrace.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = 9A1E59521EB2B0B9002206A5 /* SBTrace.cpp */; };
@@ -2864,11 +2864,11 @@
9A0FDE991E8EF5010086B2F5 /* RegisterInfos_arm.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
RegisterInfos_arm.h; path = Utility/RegisterInfos_arm.h; sourceTree =
"<group>"; };
9A0FDE9A1E8EF5010086B2F5 /* RegisterInfos_arm64.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
RegisterInfos_arm64.h; path = Utility/RegisterInfos_arm64.h; sourceTree =
"<group>"; };
9A0FDE9B1E8EF5010086B2F5 /* RegisterInfos_mips.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
RegisterInfos_mips.h; path = Utility/RegisterInfos_mips.h; sourceTree =
"<group>"; };
- 9A1542F41F0EE44000DEA1D8 /* CMakeLists.txt */ = {isa =
PBXFileReference; lastKnownFileType = text; path = CMakeLists.txt; sourceTree =
"<group>"; };
- 9A1542F51F0EE44000DEA1D8 /* MockTildeExpressionResolver.cpp */
= {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path =
MockTildeExpressionResolver.cpp; sourceTree = "<group>"; };
- 9A1542F61F0EE44000DEA1D8 /* MockTildeExpressionResolver.h */ =
{isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path =
MockTildeExpressionResolver.h; sourceTree = "<group>"; };
- 9A1542F71F0EE44000DEA1D8 /* TestUtilities.cpp */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path =
TestUtilities.cpp; sourceTree = "<group>"; };
- 9A1542F81F0EE44000DEA1D8 /* TestUtilities.h */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestUtilities.h;
sourceTree = "<group>"; };
+ 9A1890311F47D5D400394BCA /* CMakeLists.txt */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name =
CMakeLists.txt; path = TestingSupport/CMakeLists.txt; sourceTree = "<group>"; };
+ 9A1890321F47D5D400394BCA /* MockTildeExpressionResolver.cpp */
= {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.cpp.cpp; name = MockTildeExpressionResolver.cpp; path =
TestingSupport/MockTildeExpressionResolver.cpp; sourceTree = "<group>"; };
+ 9A1890331F47D5D400394BCA /* MockTildeExpressionResolver.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
name = MockTildeExpressionResolver.h; path =
TestingSupport/MockTildeExpressionResolver.h; sourceTree = "<group>"; };
+ 9A1890341F47D5D400394BCA /* TestUtilities.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = TestUtilities.cpp; path = TestingSupport/TestUtilities.cpp; sourceTree =
"<group>"; };
+ 9A1890351F47D5D400394BCA /* TestUtilities.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
TestUtilities.h; path = TestingSupport/TestUtilities.h; sourceTree = "<group>";
};
9A19A6A51163BB7E00E0D453 /* SBValue.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
SBValue.h; path = include/lldb/API/SBValue.h; sourceTree = "<group>"; };
9A19A6AD1163BB9800E0D453 /* SBValue.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = SBValue.cpp; path = source/API/SBValue.cpp; sourceTree = "<group>"; };
9A1E59521EB2B0B9002206A5 /* SBTrace.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = SBTrace.cpp; path = source/API/SBTrace.cpp; sourceTree = "<group>"; };
@@ -3337,6 +3337,7 @@
2321F9331BDD326500BA9A93 /* unittests */ = {
isa = PBXGroup;
children = (
+ 9A1890301F47D5BC00394BCA /* TestingSupport */,
23E2E52C1D903806006F38BB /* Breakpoint */,
23CB14E51D66CBEB00EDDDE1 /* Core */,
9A2057421F3B904C00F6C293 /* debugserver */,
@@ -3408,7 +3409,6 @@
9A3D43CC1F3150D200EB767C /* TimeoutTest.cpp */,
9A3D43C51F3150D200EB767C /* TimerTest.cpp */,
9A3D43C41F3150D200EB767C /* VASprintfTest.cpp
*/,
- 9A1542F31F0EE44000DEA1D8 /* Helpers */,
2321F9431BDD346100BA9A93 /* CMakeLists.txt */,
23CB15041D66CD9200EDDDE1 /* Inputs */,
2321F9441BDD346100BA9A93 /*
StringExtractorTest.cpp */,
@@ -6339,16 +6339,16 @@
name = "SysV-mips";
sourceTree = "<group>";
};
- 9A1542F31F0EE44000DEA1D8 /* Helpers */ = {
+ 9A1890301F47D5BC00394BCA /* TestingSupport */ = {
isa = PBXGroup;
children = (
- 9A1542F41F0EE44000DEA1D8 /* CMakeLists.txt */,
- 9A1542F51F0EE44000DEA1D8 /*
MockTildeExpressionResolver.cpp */,
- 9A1542F61F0EE44000DEA1D8 /*
MockTildeExpressionResolver.h */,
- 9A1542F71F0EE44000DEA1D8 /* TestUtilities.cpp
*/,
- 9A1542F81F0EE44000DEA1D8 /* TestUtilities.h */,
+ 9A1890311F47D5D400394BCA /* CMakeLists.txt */,
+ 9A1890321F47D5D400394BCA /*
MockTildeExpressionResolver.cpp */,
+ 9A1890331F47D5D400394BCA /*
MockTildeExpressionResolver.h */,
+ 9A1890341F47D5D400394BCA /* TestUtilities.cpp
*/,
+ 9A1890351F47D5D400394BCA /* TestUtilities.h */,
);
- path = Helpers;
+ name = TestingSupport;
sourceTree = "<group>";
};
9A2057091F3B81DE00F6C293 /* DWARF */ = {
@@ -7221,7 +7221,6 @@
23E2E5321D903832006F38BB /*
BreakpointIDTest.cpp in Sources */,
23CB15381D66DA9300EDDDE1 /*
PythonExceptionStateTests.cpp in Sources */,
9A3D43D81F3151C400EB767C /* NameMatchesTest.cpp
in Sources */,
- 9A1542F91F0EE48600DEA1D8 /*
MockTildeExpressionResolver.cpp in Sources */,
23CB15391D66DA9300EDDDE1 /*
DataExtractorTest.cpp in Sources */,
9A3D43ED1F3237F900EB767C /* StateTest.cpp in
Sources */,
23CB153A1D66DA9300EDDDE1 /*
GDBRemoteClientBaseTest.cpp in Sources */,
@@ -7232,7 +7231,6 @@
23CB153D1D66DA9300EDDDE1 /*
GDBRemoteCommunicationClientTest.cpp in Sources */,
23CB153E1D66DA9300EDDDE1 /*
PythonDataObjectsTests.cpp in Sources */,
9A3D43D71F3151C400EB767C /* LogTest.cpp in
Sources */,
- 9A1542FA1F0EE48600DEA1D8 /* TestUtilities.cpp
in Sources */,
9A2057181F3B861400F6C293 /* TestType.cpp in
Sources */,
9A2057171F3B861400F6C293 /*
TestDWARFCallFrameInfo.cpp in Sources */,
9A3D43EC1F3237F900EB767C /* ListenerTest.cpp in
Sources */,
@@ -7244,9 +7242,11 @@
23CB15401D66DA9300EDDDE1 /*
TestClangASTContext.cpp in Sources */,
23CB15411D66DA9300EDDDE1 /*
StringExtractorTest.cpp in Sources */,
9A2057031F3A605200F6C293 /* VASprintfTest.cpp
in Sources */,
+ 9A18903C1F47D5E600394BCA /* TestUtilities.cpp
in Sources */,
23CB15421D66DA9300EDDDE1 /* TaskPoolTest.cpp in
Sources */,
23CB15431D66DA9300EDDDE1 /* BroadcasterTest.cpp
in Sources */,
9A3D43EE1F3237F900EB767C /*
StreamCallbackTest.cpp in Sources */,
+ 9A18903B1F47D5E600394BCA /*
MockTildeExpressionResolver.cpp in Sources */,
23CB15441D66DA9300EDDDE1 /* ScalarTest.cpp in
Sources */,
9A2057391F3B8E7E00F6C293 /* HostTest.cpp in
Sources */,
23CB15451D66DA9300EDDDE1 /*
SocketAddressTest.cpp in Sources */,
@@ -8496,7 +8496,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
@@ -8538,7 +8538,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
@@ -8580,7 +8580,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
@@ -8622,7 +8622,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
@@ -8664,7 +8664,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
@@ -8706,7 +8706,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
@@ -8748,7 +8748,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
@@ -8790,7 +8790,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- LLDB_GTESTS_CFLAGS = "-I ${SOURCE_ROOT} -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
+ LLDB_GTESTS_CFLAGS = "-I unittests -I
$(LLVM_SOURCE_DIR)/utils/unittest/googlemock/include -I
$(LLVM_SOURCE_DIR)/utils/unittest/googletest/include -I
$(LLVM_SOURCE_DIR)/include -I $(LLVM_BUILD_DIR)/x86_64/include
-DYAML2OBJ=\"\\\"$(LLVM_BUILD_DIR)/x86_64/bin/yaml2obj\\\"\" -I include -I
source -I $(PYTHON_FRAMEWORK_PATH)/Headers";
LLDB_GTESTS_LDFLAGS =
"$(LLVM_BUILD_DIR)/x86_64/lib/libgtest.a -L
$(PYTHON_FRAMEWORK_PATH)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/lib
-l python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
OTHER_CFLAGS = (
"-fno-rtti",
Modified: lldb/trunk/unittests/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/CMakeLists.txt?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/CMakeLists.txt (original)
+++ lldb/trunk/unittests/CMakeLists.txt Tue Oct 3 14:20:18 2017
@@ -2,7 +2,7 @@ add_custom_target(LLDBUnitTests)
set_target_properties(LLDBUnitTests PROPERTIES FOLDER "LLDB tests")
include_directories(${LLDB_SOURCE_ROOT})
-include_directories(${LLDB_PROJECT_ROOT})
+include_directories(${LLDB_PROJECT_ROOT}/unittests)
set(LLDB_GTEST_COMMON_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/gtest_common.h)
if (MSVC)
@@ -59,6 +59,7 @@ function(add_unittest_inputs test_name i
endforeach()
endfunction()
+add_subdirectory(TestingSupport)
add_subdirectory(Breakpoint)
add_subdirectory(Core)
add_subdirectory(Editline)
Modified: lldb/trunk/unittests/Interpreter/TestCompletion.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Interpreter/TestCompletion.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/Interpreter/TestCompletion.cpp (original)
+++ lldb/trunk/unittests/Interpreter/TestCompletion.cpp Tue Oct 3 14:20:18 2017
@@ -12,7 +12,7 @@
#include "lldb/Utility/StringList.h"
#include "lldb/Utility/TildeExpressionResolver.h"
-#include "unittests/Utility/Helpers/MockTildeExpressionResolver.h"
+#include "TestingSupport/MockTildeExpressionResolver.h"
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
Modified: lldb/trunk/unittests/ObjectFile/ELF/TestObjectFileELF.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/ObjectFile/ELF/TestObjectFileELF.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/ObjectFile/ELF/TestObjectFileELF.cpp (original)
+++ lldb/trunk/unittests/ObjectFile/ELF/TestObjectFileELF.cpp Tue Oct 3
14:20:18 2017
@@ -14,7 +14,7 @@
#include "lldb/Core/ModuleSpec.h"
#include "lldb/Core/Section.h"
#include "lldb/Host/HostInfo.h"
-#include "unittests/Utility/Helpers/TestUtilities.h"
+#include "TestingSupport/TestUtilities.h"
#include "llvm/ADT/Optional.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/Path.h"
Modified: lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp (original)
+++ lldb/trunk/unittests/Process/minidump/MinidumpParserTest.cpp Tue Oct 3
14:20:18 2017
@@ -23,7 +23,7 @@
#include "lldb/Utility/DataBufferLLVM.h"
#include "lldb/Utility/DataExtractor.h"
#include "lldb/Utility/FileSpec.h"
-#include "unittests/Utility/Helpers/TestUtilities.h"
+#include "TestingSupport/TestUtilities.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include "llvm/Support/FileSystem.h"
Modified: lldb/trunk/unittests/Symbol/TestDWARFCallFrameInfo.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Symbol/TestDWARFCallFrameInfo.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/Symbol/TestDWARFCallFrameInfo.cpp (original)
+++ lldb/trunk/unittests/Symbol/TestDWARFCallFrameInfo.cpp Tue Oct 3 14:20:18
2017
@@ -16,7 +16,7 @@
#include "lldb/Host/HostInfo.h"
#include "lldb/Symbol/DWARFCallFrameInfo.h"
#include "lldb/Utility/StreamString.h"
-#include "unittests/Utility/Helpers/TestUtilities.h"
+#include "TestingSupport/TestUtilities.h"
#include "llvm/Support/FileUtilities.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/Program.h"
Modified: lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp (original)
+++ lldb/trunk/unittests/SymbolFile/DWARF/SymbolFileDWARFTests.cpp Tue Oct 3
14:20:18 2017
@@ -28,7 +28,7 @@
#include "lldb/Symbol/LineTable.h"
#include "lldb/Symbol/SymbolVendor.h"
#include "lldb/Utility/FileSpec.h"
-#include "unittests/Utility/Helpers/TestUtilities.h"
+#include "TestingSupport/TestUtilities.h"
using namespace lldb_private;
Modified: lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp (original)
+++ lldb/trunk/unittests/SymbolFile/PDB/SymbolFilePDBTests.cpp Tue Oct 3
14:20:18 2017
@@ -28,7 +28,7 @@
#include "lldb/Symbol/LineTable.h"
#include "lldb/Symbol/SymbolVendor.h"
#include "lldb/Utility/FileSpec.h"
-#include "unittests/Utility/Helpers/TestUtilities.h"
+#include "TestingSupport/TestUtilities.h"
#if defined(_MSC_VER)
#include "lldb/Host/windows/windows.h"
Modified: lldb/trunk/unittests/Target/ModuleCacheTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Target/ModuleCacheTest.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/Target/ModuleCacheTest.cpp (original)
+++ lldb/trunk/unittests/Target/ModuleCacheTest.cpp Tue Oct 3 14:20:18 2017
@@ -10,7 +10,7 @@
#include "lldb/Host/HostInfo.h"
#include "lldb/Symbol/SymbolContext.h"
#include "lldb/Target/ModuleCache.h"
-#include "unittests/Utility/Helpers/TestUtilities.h"
+#include "TestingSupport/TestUtilities.h"
using namespace lldb_private;
using namespace lldb;
Copied: lldb/trunk/unittests/TestingSupport/CMakeLists.txt (from r314832,
lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt)
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/TestingSupport/CMakeLists.txt?p2=lldb/trunk/unittests/TestingSupport/CMakeLists.txt&p1=lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt&r1=314832&r2=314849&rev=314849&view=diff
==============================================================================
(empty)
Copied: lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.cpp
(from r314832,
lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp)
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.cpp?p2=lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.cpp&p1=lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp&r1=314832&r2=314849&rev=314849&view=diff
==============================================================================
(empty)
Copied: lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.h (from
r314832, lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h)
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.h?p2=lldb/trunk/unittests/TestingSupport/MockTildeExpressionResolver.h&p1=lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h&r1=314832&r2=314849&rev=314849&view=diff
==============================================================================
(empty)
Copied: lldb/trunk/unittests/TestingSupport/TestUtilities.cpp (from r314832,
lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp)
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/TestingSupport/TestUtilities.cpp?p2=lldb/trunk/unittests/TestingSupport/TestUtilities.cpp&p1=lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp&r1=314832&r2=314849&rev=314849&view=diff
==============================================================================
(empty)
Copied: lldb/trunk/unittests/TestingSupport/TestUtilities.h (from r314832,
lldb/trunk/unittests/Utility/Helpers/TestUtilities.h)
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/TestingSupport/TestUtilities.h?p2=lldb/trunk/unittests/TestingSupport/TestUtilities.h&p1=lldb/trunk/unittests/Utility/Helpers/TestUtilities.h&r1=314832&r2=314849&rev=314849&view=diff
==============================================================================
(empty)
Modified: lldb/trunk/unittests/Utility/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/CMakeLists.txt?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/Utility/CMakeLists.txt (original)
+++ lldb/trunk/unittests/Utility/CMakeLists.txt Tue Oct 3 14:20:18 2017
@@ -1,5 +1,3 @@
-add_subdirectory(Helpers)
-
add_lldb_unittest(UtilityTests
ConstStringTest.cpp
JSONTest.cpp
Removed: lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt?rev=314848&view=auto
==============================================================================
--- lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt (original)
+++ lldb/trunk/unittests/Utility/Helpers/CMakeLists.txt (removed)
@@ -1,11 +0,0 @@
-set(EXCLUDE_FROM_ALL ON)
-add_lldb_library(lldbUtilityHelpers
- MockTildeExpressionResolver.cpp
- TestUtilities.cpp
-
- LINK_LIBS
- lldbUtility
-
- LINK_COMPONENTS
- Support
- )
Removed: lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp?rev=314848&view=auto
==============================================================================
--- lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp
(original)
+++ lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.cpp
(removed)
@@ -1,80 +0,0 @@
-//===----------------- MockTildeExpressionResolver.cpp ----------*- C++
-*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "MockTildeExpressionResolver.h"
-#include "llvm/Support/Path.h"
-
-using namespace lldb_private;
-using namespace llvm;
-
-MockTildeExpressionResolver::MockTildeExpressionResolver(StringRef CurrentUser,
- StringRef HomeDir)
- : CurrentUser(CurrentUser) {
- UserDirectories.insert(std::make_pair(CurrentUser, HomeDir));
-}
-
-void MockTildeExpressionResolver::AddKnownUser(StringRef User,
- StringRef HomeDir) {
- assert(UserDirectories.find(User) == UserDirectories.end());
- UserDirectories.insert(std::make_pair(User, HomeDir));
-}
-
-void MockTildeExpressionResolver::Clear() {
- CurrentUser = StringRef();
- UserDirectories.clear();
-}
-
-void MockTildeExpressionResolver::SetCurrentUser(StringRef User) {
- assert(UserDirectories.find(User) != UserDirectories.end());
- CurrentUser = User;
-}
-
-bool MockTildeExpressionResolver::ResolveExact(StringRef Expr,
- SmallVectorImpl<char> &Output) {
- Output.clear();
-
- assert(!llvm::any_of(
- Expr, [](char c) { return llvm::sys::path::is_separator(c); }));
- assert(Expr.empty() || Expr[0] == '~');
- Expr = Expr.drop_front();
- if (Expr.empty()) {
- auto Dir = UserDirectories[CurrentUser];
- Output.append(Dir.begin(), Dir.end());
- return true;
- }
-
- for (const auto &User : UserDirectories) {
- if (User.getKey() != Expr)
- continue;
- Output.append(User.getValue().begin(), User.getValue().end());
- return true;
- }
- return false;
-}
-
-bool MockTildeExpressionResolver::ResolvePartial(StringRef Expr,
- StringSet<> &Output) {
- Output.clear();
-
- assert(!llvm::any_of(
- Expr, [](char c) { return llvm::sys::path::is_separator(c); }));
- assert(Expr.empty() || Expr[0] == '~');
- Expr = Expr.drop_front();
-
- SmallString<16> QualifiedName("~");
- for (const auto &User : UserDirectories) {
- if (!User.getKey().startswith(Expr))
- continue;
- QualifiedName.resize(1);
- QualifiedName.append(User.getKey().begin(), User.getKey().end());
- Output.insert(QualifiedName);
- }
-
- return !Output.empty();
-}
Removed: lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h?rev=314848&view=auto
==============================================================================
--- lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h
(original)
+++ lldb/trunk/unittests/Utility/Helpers/MockTildeExpressionResolver.h (removed)
@@ -1,37 +0,0 @@
-//===--------------------- TildeExpressionResolver.h ------------*- C++
-*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_UNITTESTS_UTILITY_MOCKS_MOCK_TILDE_EXPRESSION_RESOLVER_H
-#define LLDB_UNITTESTS_UTILITY_MOCKS_MOCK_TILDE_EXPRESSION_RESOLVER_H
-
-#include "lldb/Utility/TildeExpressionResolver.h"
-
-#include "llvm/ADT/SmallString.h"
-#include "llvm/ADT/StringMap.h"
-
-namespace lldb_private {
-class MockTildeExpressionResolver : public TildeExpressionResolver {
- llvm::StringRef CurrentUser;
- llvm::StringMap<llvm::StringRef> UserDirectories;
-
-public:
- MockTildeExpressionResolver(llvm::StringRef CurrentUser,
- llvm::StringRef HomeDir);
-
- void AddKnownUser(llvm::StringRef User, llvm::StringRef HomeDir);
- void Clear();
- void SetCurrentUser(llvm::StringRef User);
-
- bool ResolveExact(llvm::StringRef Expr,
- llvm::SmallVectorImpl<char> &Output) override;
- bool ResolvePartial(llvm::StringRef Expr, llvm::StringSet<> &Output)
override;
-};
-} // namespace lldb_private
-
-#endif
Removed: lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp?rev=314848&view=auto
==============================================================================
--- lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp (original)
+++ lldb/trunk/unittests/Utility/Helpers/TestUtilities.cpp (removed)
@@ -1,22 +0,0 @@
-//===- TestUtilities.cpp ----------------------------------------*- C++
-*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "TestUtilities.h"
-#include "llvm/ADT/SmallString.h"
-#include "llvm/Support/FileSystem.h"
-#include "llvm/Support/Path.h"
-
-extern const char *TestMainArgv0;
-
-std::string lldb_private::GetInputFilePath(const llvm::Twine &name) {
- llvm::SmallString<128> result = llvm::sys::path::parent_path(TestMainArgv0);
- llvm::sys::fs::make_absolute(result);
- llvm::sys::path::append(result, "Inputs", name);
- return result.str();
-}
Removed: lldb/trunk/unittests/Utility/Helpers/TestUtilities.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/Helpers/TestUtilities.h?rev=314848&view=auto
==============================================================================
--- lldb/trunk/unittests/Utility/Helpers/TestUtilities.h (original)
+++ lldb/trunk/unittests/Utility/Helpers/TestUtilities.h (removed)
@@ -1,20 +0,0 @@
-//===- TestUtilities.h ------------------------------------------*- C++
-*-===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLDB_UNITTESTS_UTILITY_HELPERS_TESTUTILITIES_H
-#define LLDB_UNITTESTS_UTILITY_HELPERS_TESTUTILITIES_H
-
-#include "llvm/ADT/Twine.h"
-#include <string>
-
-namespace lldb_private {
-std::string GetInputFilePath(const llvm::Twine &name);
-}
-
-#endif
Modified: lldb/trunk/unittests/Utility/StructuredDataTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/StructuredDataTest.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/Utility/StructuredDataTest.cpp (original)
+++ lldb/trunk/unittests/Utility/StructuredDataTest.cpp Tue Oct 3 14:20:18 2017
@@ -9,7 +9,7 @@
#include "gtest/gtest.h"
-#include "Helpers/TestUtilities.h"
+#include "TestingSupport/TestUtilities.h"
#include "lldb/Utility/Status.h"
#include "lldb/Utility/StreamString.h"
#include "lldb/Utility/StructuredData.h"
Modified: lldb/trunk/unittests/Utility/TildeExpressionResolverTest.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/Utility/TildeExpressionResolverTest.cpp?rev=314849&r1=314848&r2=314849&view=diff
==============================================================================
--- lldb/trunk/unittests/Utility/TildeExpressionResolverTest.cpp (original)
+++ lldb/trunk/unittests/Utility/TildeExpressionResolverTest.cpp Tue Oct 3
14:20:18 2017
@@ -1,6 +1,6 @@
#include "gtest/gtest.h"
-#include "Helpers/MockTildeExpressionResolver.h"
+#include "TestingSupport/MockTildeExpressionResolver.h"
#include "lldb/Utility/TildeExpressionResolver.h"
#include "llvm/ADT/SmallString.h"
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
