Author: jingham
Date: Wed Feb 28 14:41:11 2018
New Revision: 326378
URL: http://llvm.org/viewvc/llvm-project?rev=326378&view=rev
Log:
Fix up the gtest targets for changes in the UnwindAssembly tests.
Modified:
lldb/trunk/lldb.xcodeproj/project.pbxproj
Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=326378&r1=326377&r2=326378&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Wed Feb 28 14:41:11 2018
@@ -746,6 +746,9 @@
4CE4EFB41E899A4000A80C06 /* RegisterContextOpenBSD_x86_64.cpp
in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4EFAD1E899A1200A80C06 /*
RegisterContextOpenBSD_x86_64.cpp */; };
4CE4F673162C971A00F75CB3 /* SBExpressionOptions.h in Headers */
= {isa = PBXBuildFile; fileRef = 4CE4F672162C971A00F75CB3 /*
SBExpressionOptions.h */; settings = {ATTRIBUTES = (Public, ); }; };
4CE4F675162C973F00F75CB3 /* SBExpressionOptions.cpp in Sources
*/ = {isa = PBXBuildFile; fileRef = 4CE4F674162C973F00F75CB3 /*
SBExpressionOptions.cpp */; };
+ 4CEC86A4204738C5009B37B1 /* TestArm64InstEmulation.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 4CEC86A3204738C5009B37B1 /*
TestArm64InstEmulation.cpp */; };
+ 4CEC86A7204738EB009B37B1 /* TestPPC64InstEmulation.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = 4CEC86A6204738EA009B37B1 /*
TestPPC64InstEmulation.cpp */; };
+ 4CEC86A92047395F009B37B1 /* Python.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 2326CF3F1BDD613E00A5CEAC /* Python.framework */;
};
4CF3D80C15AF4DC800845BF3 /* Security.framework in Frameworks */
= {isa = PBXBuildFile; fileRef = EDB919B414F6F10D008FF64B /* Security.framework
*/; };
4CF52AF51428291E0051E832 /* SBFileSpecList.h in Headers */ =
{isa = PBXBuildFile; fileRef = 4CF52AF41428291E0051E832 /* SBFileSpecList.h */;
settings = {ATTRIBUTES = (Public, ); }; };
4CF52AF8142829390051E832 /* SBFileSpecList.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = 4CF52AF7142829390051E832 /* SBFileSpecList.cpp
*/; };
@@ -954,7 +957,6 @@
AF235EB41FBE7858009C5541 /* RegisterInfoPOSIX_ppc64le.h in
Headers */ = {isa = PBXBuildFile; fileRef = AF235EB21FBE7857009C5541 /*
RegisterInfoPOSIX_ppc64le.h */; };
AF235EB51FBE7858009C5541 /* RegisterInfoPOSIX_ppc64le.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = AF235EB31FBE7858009C5541 /*
RegisterInfoPOSIX_ppc64le.cpp */; };
AF23B4DB19009C66003E2A58 /* FreeBSDSignals.cpp in Sources */ =
{isa = PBXBuildFile; fileRef = AF23B4D919009C66003E2A58 /* FreeBSDSignals.cpp
*/; };
- AF248A4D1DA71C77000B814D /* TestArm64InstEmulation.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = AF248A4C1DA71C77000B814D /*
TestArm64InstEmulation.cpp */; };
AF254E31170CCC33007AE5C9 /* PlatformDarwinKernel.cpp in Sources
*/ = {isa = PBXBuildFile; fileRef = AF254E2F170CCC33007AE5C9 /*
PlatformDarwinKernel.cpp */; };
AF25AB26188F685C0030DEC3 /* AppleGetQueuesHandler.cpp in
Sources */ = {isa = PBXBuildFile; fileRef = AF25AB24188F685C0030DEC3 /*
AppleGetQueuesHandler.cpp */; };
AF26703A1852D01E00B6CC36 /* Queue.cpp in Sources */ = {isa =
PBXBuildFile; fileRef = AF2670381852D01E00B6CC36 /* Queue.cpp */; };
@@ -2627,6 +2629,8 @@
4CE4F672162C971A00F75CB3 /* SBExpressionOptions.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
SBExpressionOptions.h; path = include/lldb/API/SBExpressionOptions.h;
sourceTree = "<group>"; };
4CE4F674162C973F00F75CB3 /* SBExpressionOptions.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = SBExpressionOptions.cpp; path = source/API/SBExpressionOptions.cpp;
sourceTree = "<group>"; };
4CE4F676162CE1E100F75CB3 /* SBExpressionOptions.i */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.c.preprocessed; path = SBExpressionOptions.i; sourceTree =
"<group>"; };
+ 4CEC86A3204738C5009B37B1 /* TestArm64InstEmulation.cpp */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.cpp.cpp; name = TestArm64InstEmulation.cpp; path =
UnwindAssembly/ARM64/TestArm64InstEmulation.cpp; sourceTree = "<group>"; };
+ 4CEC86A6204738EA009B37B1 /* TestPPC64InstEmulation.cpp */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.cpp.cpp; name = TestPPC64InstEmulation.cpp; path =
UnwindAssembly/PPC64/TestPPC64InstEmulation.cpp; sourceTree = "<group>"; };
4CEDAED311754F5E00E875A6 /* ThreadPlanStepUntil.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
ThreadPlanStepUntil.h; path = include/lldb/Target/ThreadPlanStepUntil.h;
sourceTree = "<group>"; };
4CF52AF41428291E0051E832 /* SBFileSpecList.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
SBFileSpecList.h; path = include/lldb/API/SBFileSpecList.h; sourceTree =
"<group>"; };
4CF52AF7142829390051E832 /* SBFileSpecList.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = SBFileSpecList.cpp; path = source/API/SBFileSpecList.cpp; sourceTree =
"<group>"; };
@@ -3031,7 +3035,6 @@
AF235EB31FBE7858009C5541 /* RegisterInfoPOSIX_ppc64le.cpp */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.cpp.cpp; name = RegisterInfoPOSIX_ppc64le.cpp; path =
Utility/RegisterInfoPOSIX_ppc64le.cpp; sourceTree = "<group>"; };
AF23B4D919009C66003E2A58 /* FreeBSDSignals.cpp */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
name = FreeBSDSignals.cpp; path = Utility/FreeBSDSignals.cpp; sourceTree =
"<group>"; };
AF23B4DA19009C66003E2A58 /* FreeBSDSignals.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name =
FreeBSDSignals.h; path = Utility/FreeBSDSignals.h; sourceTree = "<group>"; };
- AF248A4C1DA71C77000B814D /* TestArm64InstEmulation.cpp */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.cpp.cpp; name = TestArm64InstEmulation.cpp; path =
UnwindAssembly/InstEmulation/TestArm64InstEmulation.cpp; sourceTree =
"<group>"; };
AF254E2F170CCC33007AE5C9 /* PlatformDarwinKernel.cpp */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = PlatformDarwinKernel.cpp; sourceTree = "<group>"; };
AF254E30170CCC33007AE5C9 /* PlatformDarwinKernel.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
PlatformDarwinKernel.h; sourceTree = "<group>"; };
AF25AB24188F685C0030DEC3 /* AppleGetQueuesHandler.cpp */ = {isa
= PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp;
path = AppleGetQueuesHandler.cpp; sourceTree = "<group>"; };
@@ -3199,6 +3202,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 4CEC86A92047395F009B37B1 /* Python.framework in
Frameworks */,
23CB15491D66DA9300EDDDE1 /* libxml2.2.dylib in
Frameworks */,
23CB154A1D66DA9300EDDDE1 /* libpanel.dylib in
Frameworks */,
23CB154B1D66DA9300EDDDE1 /* libedit.dylib in
Frameworks */,
@@ -6037,6 +6041,22 @@
path = OpenBSD;
sourceTree = "<group>";
};
+ 4CEC86A5204738CC009B37B1 /* ARM64 */ = {
+ isa = PBXGroup;
+ children = (
+ 4CEC86A3204738C5009B37B1 /*
TestArm64InstEmulation.cpp */,
+ );
+ name = ARM64;
+ sourceTree = "<group>";
+ };
+ 4CEC86A8204738EE009B37B1 /* PPC64 */ = {
+ isa = PBXGroup;
+ children = (
+ 4CEC86A6204738EA009B37B1 /*
TestPPC64InstEmulation.cpp */,
+ );
+ name = PPC64;
+ sourceTree = "<group>";
+ };
4CEE62F71145F1C70064CF93 /* GDB Remote */ = {
isa = PBXGroup;
children = (
@@ -6560,14 +6580,6 @@
name = "SysV-arm64";
sourceTree = "<group>";
};
- AF248A4B1DA71C67000B814D /* InstEmulation */ = {
- isa = PBXGroup;
- children = (
- AF248A4C1DA71C77000B814D /*
TestArm64InstEmulation.cpp */,
- );
- name = InstEmulation;
- sourceTree = "<group>";
- };
AF2BCA6518C7EFDE005B4526 /* JITLoader */ = {
isa = PBXGroup;
children = (
@@ -6653,7 +6665,8 @@
AFEC5FD31D94F9130076A480 /* UnwindAssembly */ = {
isa = PBXGroup;
children = (
- AF248A4B1DA71C67000B814D /* InstEmulation */,
+ 4CEC86A8204738EE009B37B1 /* PPC64 */,
+ 4CEC86A5204738CC009B37B1 /* ARM64 */,
AFEC5FD41D94F9270076A480 /* x86 */,
);
name = UnwindAssembly;
@@ -7286,12 +7299,13 @@
23E2E5251D90373D006F38BB /* ArchSpecTest.cpp in
Sources */,
9A2057081F3B819100F6C293 /*
MemoryRegionInfoTest.cpp in Sources */,
9A20572D1F3B8E6600F6C293 /* TestCompletion.cpp
in Sources */,
- AF248A4D1DA71C77000B814D /*
TestArm64InstEmulation.cpp in Sources */,
23CB15371D66DA9300EDDDE1 /* PythonTestSuite.cpp
in Sources */,
23E2E5321D903832006F38BB /*
BreakpointIDTest.cpp in Sources */,
+ 4CEC86A7204738EB009B37B1 /*
TestPPC64InstEmulation.cpp in Sources */,
23CB15381D66DA9300EDDDE1 /*
PythonExceptionStateTests.cpp in Sources */,
9A3D43D81F3151C400EB767C /* NameMatchesTest.cpp
in Sources */,
23CB15391D66DA9300EDDDE1 /*
DataExtractorTest.cpp in Sources */,
+ 4CEC86A4204738C5009B37B1 /*
TestArm64InstEmulation.cpp in Sources */,
9A3D43ED1F3237F900EB767C /* StateTest.cpp in
Sources */,
23CB153A1D66DA9300EDDDE1 /*
GDBRemoteClientBaseTest.cpp in Sources */,
23CB153B1D66DA9300EDDDE1 /* SocketTest.cpp in
Sources */,
@@ -8356,7 +8370,7 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework;
+ PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework/;
PYTHON_VERSION_MAJOR = 2;
PYTHON_VERSION_MINOR = 7;
SDKROOT = "";
@@ -8446,7 +8460,7 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework;
+ PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework/;
PYTHON_VERSION_MAJOR = 2;
PYTHON_VERSION_MINOR = 7;
SDKROOT = "";
@@ -8740,7 +8754,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- 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_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)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/include/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
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",
@@ -8782,7 +8796,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- 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_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)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/include/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
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",
@@ -8824,7 +8838,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- 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_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)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/include/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
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",
@@ -8866,7 +8880,7 @@
"$(LLVM_SOURCE_DIR)/tools/clang/include",
"$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include",
);
- 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_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)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/include/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)";
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",
@@ -9399,7 +9413,7 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework;
+ PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework/;
PYTHON_VERSION_MAJOR = 2;
PYTHON_VERSION_MINOR = 7;
SDKROOT = "";
@@ -10113,7 +10127,7 @@
"$(LLDB_ZLIB_LDFLAGS)",
"$(LLDB_COVERAGE_LDFLAGS)",
);
- PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework;
+ PYTHON_FRAMEWORK_PATH =
/System/Library/Frameworks/Python.framework/;
PYTHON_VERSION_MAJOR = 2;
PYTHON_VERSION_MINOR = 7;
SDKROOT = "";
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
