Title: [295605] trunk
- Revision
- 295605
- Author
- [email protected]
- Date
- 2022-06-16 12:44:58 -0700 (Thu, 16 Jun 2022)
Log Message
Add lldbWebKitTester to WebKit.xcworkspace
Unreviewed test fix.
When we switched build-webkit to workspace builds in
https://commits.webkit.org/251501@main, we stopped building it.
lldbWebKitTester must only build on macOS. Add a "lldbWebKitTester
(Platform filters)" aggregate target that selectively builds
lldbWebKitTester on Mac only, like we did for MiniBrowser in
https://commits.webkit.org/251501@main. Update the relevant schemes to
build that aggregate.
We cannot rely on lldbWebKitTester's "SUPPORTED_PLATFORMS = macosx" as a
way to make it always build for Mac, because it depends on WTF and
therefore must only build if WTF is also being built for Mac.
* Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig: Claim to
support every platform, so that the aggregate target is always
buildable and able to apply a platform filter.
* Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig:
Move "SUPPORTED_PLATFORMS = macosx" here, because lldbWebKitTester
really does need to be restricted to building for Mac.
* Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme:
* WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme:
Canonical link: https://commits.webkit.org/251610@main
Modified Paths
Diff
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig (295604 => 295605)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig 2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/Base.xcconfig 2022-06-16 19:44:58 UTC (rev 295605)
@@ -96,7 +96,7 @@
TARGET_MAC_OS_X_VERSION_MAJOR_10_14 = 101400
TARGET_MAC_OS_X_VERSION_MAJOR_10_15 = 101500
-SUPPORTED_PLATFORMS = macosx;
+SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx appletvos appletvsimulator watchos watchsimulator;
DEAD_CODE_STRIPPING = YES;
DEAD_CODE_STRIPPING[config=Debug] = NO;
Modified: trunk/Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig (295604 => 295605)
--- trunk/Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig 2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig 2022-06-16 19:44:58 UTC (rev 295605)
@@ -26,6 +26,8 @@
RELEASE_DEFINES = RELEASE_WITHOUT_OPTIMIZATIONS;
RELEASE_DEFINES[config=Debug] = ;
+SUPPORTED_PLATFORMS = macosx;
+
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) $(RELEASE_DEFINES);
GCC_OPTIMIZATION_LEVEL = 0;
STRIP_INSTALLED_PRODUCT = NO;
Modified: trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj (295604 => 295605)
--- trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj 2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj/project.pbxproj 2022-06-16 19:44:58 UTC (rev 295605)
@@ -6,6 +6,20 @@
objectVersion = 46;
objects = {
+/* Begin PBXAggregateTarget section */
+ DD1EB7BA285AB55600CD5D9C /* lldbWebKitTester (Platform filters) */ = {
+ isa = PBXAggregateTarget;
+ buildConfigurationList = DD1EB7BD285AB55600CD5D9C /* Build configuration list for PBXAggregateTarget "lldbWebKitTester (Platform filters)" */;
+ buildPhases = (
+ );
+ dependencies = (
+ DD1EB7BF285AB55B00CD5D9C /* PBXTargetDependency */,
+ );
+ name = "lldbWebKitTester (Platform filters)";
+ productName = "lldbWebKitTester (Platform filters)";
+ };
+/* End PBXAggregateTarget section */
+
/* Begin PBXBuildFile section */
0FC1C35420E5391E001E9FB0 /* DumpClassLayoutTesting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FC1C35320E5391E001E9FB0 /* DumpClassLayoutTesting.cpp */; };
7CB6844B1AFA7978002B305C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CB6844A1AFA7978002B305C /* main.cpp */; };
@@ -13,6 +27,16 @@
CE6C3B0120C0C444003E33D8 /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C3B0020C0C443003E33D8 /* libicucore.dylib */; };
/* End PBXBuildFile section */
+/* Begin PBXContainerItemProxy section */
+ DD1EB7BE285AB55B00CD5D9C /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 7C4AB3991AF0276C003FC8D1 /* Project object */;
+ proxyType = 1;
+ remoteGlobalIDString = 7C4AB3A01AF0276C003FC8D1;
+ remoteInfo = lldbWebKitTester;
+ };
+/* End PBXContainerItemProxy section */
+
/* Begin PBXCopyFilesBuildPhase section */
7C4AB39F1AF0276C003FC8D1 /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
@@ -138,6 +162,7 @@
projectRoot = "";
targets = (
7C4AB3A01AF0276C003FC8D1 /* lldbWebKitTester */,
+ DD1EB7BA285AB55600CD5D9C /* lldbWebKitTester (Platform filters) */,
);
};
/* End PBXProject section */
@@ -154,6 +179,17 @@
};
/* End PBXSourcesBuildPhase section */
+/* Begin PBXTargetDependency section */
+ DD1EB7BF285AB55B00CD5D9C /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ platformFilters = (
+ macos,
+ );
+ target = 7C4AB3A01AF0276C003FC8D1 /* lldbWebKitTester */;
+ targetProxy = DD1EB7BE285AB55B00CD5D9C /* PBXContainerItemProxy */;
+ };
+/* End PBXTargetDependency section */
+
/* Begin XCBuildConfiguration section */
7C4AB3A61AF0276C003FC8D1 /* Debug */ = {
isa = XCBuildConfiguration;
@@ -183,6 +219,18 @@
};
name = Release;
};
+ DD1EB7BB285AB55600CD5D9C /* Debug */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ };
+ name = Debug;
+ };
+ DD1EB7BC285AB55600CD5D9C /* Release */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ };
+ name = Release;
+ };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -204,6 +252,15 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
+ DD1EB7BD285AB55600CD5D9C /* Build configuration list for PBXAggregateTarget "lldbWebKitTester (Platform filters)" */ = {
+ isa = XCConfigurationList;
+ buildConfigurations = (
+ DD1EB7BB285AB55600CD5D9C /* Debug */,
+ DD1EB7BC285AB55600CD5D9C /* Release */,
+ );
+ defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
+ };
/* End XCConfigurationList section */
};
rootObject = 7C4AB3991AF0276C003FC8D1 /* Project object */;
Modified: trunk/WebKit.xcworkspace/contents.xcworkspacedata (295604 => 295605)
--- trunk/WebKit.xcworkspace/contents.xcworkspacedata 2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/WebKit.xcworkspace/contents.xcworkspacedata 2022-06-16 19:44:58 UTC (rev 295605)
@@ -32,10 +32,13 @@
location = "group:Source/WebKit/WebKit.xcodeproj">
</FileRef>
<FileRef
+ location = "group:Tools/DumpRenderTree/DumpRenderTree.xcodeproj">
+ </FileRef>
+ <FileRef
location = "group:Source/ThirdParty/gtest/xcode/gtest.xcodeproj">
</FileRef>
<FileRef
- location = "group:Tools/DumpRenderTree/DumpRenderTree.xcodeproj">
+ location = "group:Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj">
</FileRef>
<FileRef
location = "group:Tools/MiniBrowser/MiniBrowser.xcodeproj">
Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme (295604 => 295605)
--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme 2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Modules.xcscheme 2022-06-16 19:44:58 UTC (rev 295605)
@@ -216,6 +216,20 @@
ReferencedContainer = "container:Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj">
</BuildableReference>
</BuildActionEntry>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "DD1EB7BA285AB55600CD5D9C"
+ BuildableName = "lldbWebKitTester (Platform filters)"
+ BlueprintName = "lldbWebKitTester (Platform filters)"
+ ReferencedContainer = "container:Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Modified: trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme (295604 => 295605)
--- trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme 2022-06-16 19:33:07 UTC (rev 295604)
+++ trunk/WebKit.xcworkspace/xcshareddata/xcschemes/All Tools.xcscheme 2022-06-16 19:44:58 UTC (rev 295605)
@@ -76,6 +76,20 @@
ReferencedContainer = "container:Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj">
</BuildableReference>
</BuildActionEntry>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "DD1EB7BA285AB55600CD5D9C"
+ BuildableName = "lldbWebKitTester (Platform filters)"
+ BlueprintName = "lldbWebKitTester (Platform filters)"
+ ReferencedContainer = "container:Tools/lldb/lldbWebKitTester/lldbWebKitTester.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
