Modified: trunk/Tools/ChangeLog (160438 => 160439)
--- trunk/Tools/ChangeLog 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/ChangeLog 2013-12-11 17:49:44 UTC (rev 160439)
@@ -1,3 +1,23 @@
+2013-12-11 Mark Rowe <[email protected]>
+
+ <https://webkit.org/b/125563> Remove the DumpRenderTree Perl Support module
+
+ Now that old-run-webkit-tests is not used on OS X it's not worth the time and effort
+ to build and maintain this custom Perl module.
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Remove the target.
+ * DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport.c: Removed.
+ * DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupportPregenerated.pm: Removed.
+ * DumpRenderTree/mac/PerlSupport/DumpRenderTreeSupport_wrapPregenerated.c: Removed.
+ * DumpRenderTree/mac/PerlSupport/Makefile: Removed.
+ * Scripts/old-run-webkit-tests: Update a comment that referred to DumpRenderTreeSupport as a reason to
+ build DumpRenderTree.
+ (dumpToolDidCrash): Stop importing and using the module.
+ * Scripts/webkitpy/port/base.py:
+ (Port._build_driver): Update a comment in the same manner as in old-run-webkit-tests.
+
2013-12-11 Brendan Long <[email protected]>
[GTK] Add "enable-mediasource" property to WebKitWebSettings
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (160438 => 160439)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2013-12-11 17:49:44 UTC (rev 160439)
@@ -17,7 +17,6 @@
A84F609108B1370E00E9745F /* PBXTargetDependency */,
A84F608F08B1370E00E9745F /* PBXTargetDependency */,
141BF238096A451E00E0753C /* PBXTargetDependency */,
- 5DC82A701023C93D00FD1D3B /* PBXTargetDependency */,
);
name = All;
productName = All;
@@ -191,20 +190,6 @@
remoteGlobalIDString = 2D403EB2150871F9005358D2;
remoteInfo = LayoutTestHelper;
};
- 378C802315AB589B00746821 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 9340994A08540CAE007F3BC8;
- remoteInfo = DumpRenderTree;
- };
- 5DC82A6F1023C93D00FD1D3B /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 5DC82A661023C8DE00FD1D3B;
- remoteInfo = "DumpRenderTree Perl Support";
- };
A84F608E08B1370E00E9745F /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
@@ -788,24 +773,6 @@
};
/* End PBXHeadersBuildPhase section */
-/* Begin PBXLegacyTarget section */
- 5DC82A661023C8DE00FD1D3B /* DumpRenderTree Perl Support */ = {
- isa = PBXLegacyTarget;
- buildArgumentsString = "$(ACTION)";
- buildConfigurationList = 5DC82A6E1023C92A00FD1D3B /* Build configuration list for PBXLegacyTarget "DumpRenderTree Perl Support" */;
- buildPhases = (
- );
- buildToolPath = make;
- buildWorkingDirectory = "$(SRCROOT)/mac/PerlSupport";
- dependencies = (
- 378C802415AB589B00746821 /* PBXTargetDependency */,
- );
- name = "DumpRenderTree Perl Support";
- passBuildSettingsInEnvironment = 1;
- productName = "DumpRenderTree Perl Support";
- };
-/* End PBXLegacyTarget section */
-
/* Begin PBXNativeTarget section */
141BF21E096A441D00E0753C /* TestNetscapePlugIn */ = {
isa = PBXNativeTarget;
@@ -905,7 +872,6 @@
9340994A08540CAE007F3BC8 /* DumpRenderTree */,
B5A7525A08AF4A4A00138E45 /* ImageDiff */,
141BF21E096A441D00E0753C /* TestNetscapePlugIn */,
- 5DC82A661023C8DE00FD1D3B /* DumpRenderTree Perl Support */,
2D403EB2150871F9005358D2 /* LayoutTestHelper */,
);
};
@@ -1043,16 +1009,6 @@
target = 2D403EB2150871F9005358D2 /* LayoutTestHelper */;
targetProxy = 2D403F201508736C005358D2 /* PBXContainerItemProxy */;
};
- 378C802415AB589B00746821 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 9340994A08540CAE007F3BC8 /* DumpRenderTree */;
- targetProxy = 378C802315AB589B00746821 /* PBXContainerItemProxy */;
- };
- 5DC82A701023C93D00FD1D3B /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 5DC82A661023C8DE00FD1D3B /* DumpRenderTree Perl Support */;
- targetProxy = 5DC82A6F1023C93D00FD1D3B /* PBXContainerItemProxy */;
- };
A84F608F08B1370E00E9745F /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = B5A7525A08AF4A4A00138E45 /* ImageDiff */;
@@ -1138,27 +1094,6 @@
};
name = Production;
};
- 5DC82A671023C8DE00FD1D3B /* Debug */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "DumpRenderTree Perl Support";
- };
- name = Debug;
- };
- 5DC82A681023C8DE00FD1D3B /* Release */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "DumpRenderTree Perl Support";
- };
- name = Release;
- };
- 5DC82A691023C8DE00FD1D3B /* Production */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- PRODUCT_NAME = "DumpRenderTree Perl Support";
- };
- name = Production;
- };
90CBC3500F748B1300A712B7 /* Production */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = BCB281EE0CFA713D007E533E /* Base.xcconfig */;
@@ -1296,16 +1231,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Production;
};
- 5DC82A6E1023C92A00FD1D3B /* Build configuration list for PBXLegacyTarget "DumpRenderTree Perl Support" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 5DC82A671023C8DE00FD1D3B /* Debug */,
- 5DC82A681023C8DE00FD1D3B /* Release */,
- 5DC82A691023C8DE00FD1D3B /* Production */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Production;
- };
A84F609208B1371400E9745F /* Build configuration list for PBXAggregateTarget "All" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Modified: trunk/Tools/Scripts/old-run-webkit-tests (160438 => 160439)
--- trunk/Tools/Scripts/old-run-webkit-tests 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2013-12-11 17:49:44 UTC (rev 160439)
@@ -421,11 +421,8 @@
chdirWebKit();
if (!defined($root) && !$noBuildDumpTool) {
- # FIXME: We build both DumpRenderTree and WebKitTestRunner for
- # WebKitTestRunner runs because DumpRenderTree still includes
- # the DumpRenderTreeSupport module and the TestNetscapePlugin.
- # These two projects should be factored out into their own
- # projects.
+ # FIXME: We build both DumpRenderTree and WebKitTestRunner for WebKitTestRunner runs because
+ # DumpRenderTree includes TestNetscapePlugin. It should be factored out into its own project.
buildDumpTool("DumpRenderTree");
buildDumpTool("WebKitTestRunner") if $useWebKitTestRunner;
}
@@ -447,11 +444,6 @@
checkFrameworks() unless isCygwin();
-if (isAppleMacWebKit()) {
- push @INC, $productDir;
- require DumpRenderTreeSupport;
-}
-
my $layoutTestsName = "LayoutTests";
my $testDirectory = File::Spec->rel2abs($layoutTestsName);
my $expectedDirectory = $testDirectory;
@@ -1543,10 +1535,7 @@
my $pid = waitpid(-1, WNOHANG);
return 1 if ($pid == $dumpToolPID);
- # On Mac OS X, crashing may be significantly delayed by crash reporter.
- return 0 unless isAppleMacWebKit();
-
- return DumpRenderTreeSupport::processIsCrashing($dumpToolPID);
+ return 0;
}
sub configureAndOpenHTTPDIfNeeded()
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (160438 => 160439)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2013-12-11 17:47:40 UTC (rev 160438)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2013-12-11 17:49:44 UTC (rev 160439)
@@ -1392,11 +1392,8 @@
environment.disable_gcc_smartquotes()
env = environment.to_dictionary()
- # FIXME: We build both DumpRenderTree and WebKitTestRunner for
- # WebKitTestRunner runs because DumpRenderTree still includes
- # the DumpRenderTreeSupport module and the TestNetscapePlugin.
- # These two projects should be factored out into their own
- # projects.
+ # FIXME: We build both DumpRenderTree and WebKitTestRunner for WebKitTestRunner runs because
+ # DumpRenderTree includes TestNetscapePlugin. It should be factored out into its own project.
try:
self._run_script("build-dumprendertree", args=self._build_driver_flags(), env=env)
if self.get_option('webkit_test_runner'):
