<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173689] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173689">173689</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-17 02:29:31 -0700 (Wed, 17 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][GTK] Remove WebKit1 related codes
https://bugs.webkit.org/show_bug.cgi?id=136853
Patch by Renato Nagy <rnagy@inf.u-szeged.hu> on 2014-09-17
Reviewed by Csaba Osztrogonác.
Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
from scripts.
.:
* Source/PlatformGTK.cmake:
Tools:
* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(Compile32bitJSC):
(BuildAndTestWebKit2Factory):
(CompileWebKit1Only): Deleted.
(CompileWebKit2Only): Deleted.
(BuildAndTestWebKit1OnlyFactory): Deleted.
(BuildAndTestWebKit2OnlyFactory): Deleted.
* Scripts/build-webkit:
* Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl:
* Scripts/webkitpy/common/config/ports.py:
(GtkWK2Port.build_webkit_command):
(EflWK2Port.build_webkit_command):
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_gtk_wk2_port):
* Scripts/webkitpy/port/efl.py:
(EflPort.build_webkit_command):
* Scripts/webkitpy/port/gtk.py:
(GtkPort._built_libraries_path):
(GtkPort._search_paths):
(GtkPort.test_expectations_file_position):
(GtkPort.build_webkit_command):
(GtkPort.run_webkit_tests_command):
(GtkPort.warn_if_bug_missing_in_test_expectations): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformGTKcmake">trunk/Source/PlatformGTK.cmake</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsbuildwebkit">trunk/Tools/Scripts/build-webkit</a></li>
<li><a href="#trunkToolsScriptswebkitperlwebkitdirs_unittestcheckForArgumentAndRemoveFromArrayRefGettingValuepl">trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigportspy">trunk/Tools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigports_unittestpy">trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyporteflpy">trunk/Tools/Scripts/webkitpy/port/efl.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportgtkpy">trunk/Tools/Scripts/webkitpy/port/gtk.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportgtk_unittestpy">trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsrebaseline_unittestpy">trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/ChangeLog 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-17 Renato Nagy <rnagy@inf.u-szeged.hu>
+
+ [EFL][GTK] Remove WebKit1 related codes
+ https://bugs.webkit.org/show_bug.cgi?id=136853
+
+ Reviewed by Csaba Osztrogonác.
+
+ Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
+ from scripts.
+
+ * Source/PlatformGTK.cmake:
+
</ins><span class="cx"> 2014-09-16 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix FindICU.cmake
</span></span></pre></div>
<a id="trunkSourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformGTK.cmake (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformGTK.cmake 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Source/PlatformGTK.cmake 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -3,14 +3,12 @@
</span><span class="cx"> # This allows exposing a 'gir' target which builds all GObject introspection files.
</span><span class="cx"> add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
</span><span class="cx">
</span><del>-if (ENABLE_WEBKIT2)
- list(APPEND DocumentationDependencies
- WebKit2
- "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
- "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
- GObjectDOMBindings
- )
-endif ()
</del><ins>+list(APPEND DocumentationDependencies
+ GObjectDOMBindings
+ WebKit2
+ "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
+ "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
+)
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_GTKDOC)
</span><span class="cx"> install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk/html/
</span><span class="lines">@@ -51,41 +49,40 @@
</span><span class="cx"> COMMAND ${TOOLS_DIR}/gtk/check-for-webkitdom-api-breaks
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (ENABLE_WEBKIT2)
- add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
- DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
- DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
- DEPENDS WebKit2
- DEPENDS gtkdoc
- COMMAND ${TOOLS_DIR}/gtk/make-dist.py
- --source-dir=${CMAKE_SOURCE_DIR}
- --build-dir=${CMAKE_BINARY_DIR}
- --version=${PROJECT_VERSION}
- ${TOOLS_DIR}/gtk/manifest.txt
- )
</del><span class="cx">
</span><del>- add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
- DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
- COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
- )
</del><ins>+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+ DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
+ DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
+ DEPENDS WebKit2
+ DEPENDS gtkdoc
+ COMMAND ${TOOLS_DIR}/gtk/make-dist.py
+ --source-dir=${CMAKE_SOURCE_DIR}
+ --build-dir=${CMAKE_BINARY_DIR}
+ --version=${PROJECT_VERSION}
+ ${TOOLS_DIR}/gtk/manifest.txt
+)
</ins><span class="cx">
</span><del>- add_custom_target(dist
- DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
- )
</del><ins>+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
+ DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+ COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+)
</ins><span class="cx">
</span><del>- add_custom_target(distcheck
- DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
- DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
- DEPENDS WebKit2
- DEPENDS gtkdoc
- COMMAND ${TOOLS_DIR}/gtk/make-dist.py
- --check
- --source-dir=${CMAKE_SOURCE_DIR}
- --build-dir=${CMAKE_BINARY_DIR}
- --version=/webkitgtk-${PROJECT_VERSION}
- ${TOOLS_DIR}/gtk/manifest.txt
- COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
- )
-endif ()
</del><ins>+add_custom_target(dist
+ DEPENDS ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar.xz
+)
+
+add_custom_target(distcheck
+ DEPENDS ${TOOLS_DIR}/gtk/make-dist.py
+ DEPENDS ${TOOLS_DIR}/gtk/manifest.txt
+ DEPENDS WebKit2
+ DEPENDS gtkdoc
+ COMMAND ${TOOLS_DIR}/gtk/make-dist.py
+ --check
+ --source-dir=${CMAKE_SOURCE_DIR}
+ --build-dir=${CMAKE_BINARY_DIR}
+ --version=/webkitgtk-${PROJECT_VERSION}
+ ${TOOLS_DIR}/gtk/manifest.txt
+ COMMAND xz -f ${CMAKE_BINARY_DIR}/webkitgtk-${PROJECT_VERSION}.tar
+)
</ins></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> "slavenames": ["wincairo-1"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "EFL Linux 64-bit Release WK2", "type": "BuildAndTestWebKit2Only", "builddir": "efl-linux-64-release-wk2",
</del><ins>+ "name": "EFL Linux 64-bit Release WK2", "type": "BuildAndTest", "builddir": "efl-linux-64-release-wk2",
</ins><span class="cx"> "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["efl-linux-slave-2"]
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -235,14 +235,7 @@
</span><span class="cx"> class Compile32bitJSC(CompileWebKit):
</span><span class="cx"> command = ["perl", "./Tools/Scripts/build-jsc", "--32-bit", WithProperties("--%(configuration)s")]
</span><span class="cx">
</span><del>-class CompileWebKit1Only(CompileWebKit):
- command = ["perl", "./Tools/Scripts/build-webkit", "--no-webkit2", WithProperties("--%(configuration)s")]
</del><span class="cx">
</span><del>-
-class CompileWebKit2Only(CompileWebKit):
- command = ["perl", "./Tools/Scripts/build-webkit", "--no-webkit1", WithProperties("--%(configuration)s")]
-
-
</del><span class="cx"> class ArchiveBuiltProduct(shell.ShellCommand):
</span><span class="cx"> command = ["python", "./Tools/BuildSlaveSupport/built-product-archive",
</span><span class="cx"> WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s"), "archive"]
</span><span class="lines">@@ -903,13 +896,6 @@
</span><span class="cx"> CompileClass = CompileWebKit
</span><span class="cx"> LayoutTestClass = RunWebKit2Tests
</span><span class="cx">
</span><del>-class BuildAndTestWebKit1OnlyFactory(BuildAndTestFactory):
- CompileClass = CompileWebKit1Only
-
-class BuildAndTestWebKit2OnlyFactory(BuildAndTestFactory):
- CompileClass = CompileWebKit2Only
- LayoutTestClass = RunWebKit2Tests
-
</del><span class="cx"> class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
</span><span class="cx"> LayoutTestClass = None
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/ChangeLog 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-09-17 Renato Nagy <rnagy@inf.u-szeged.hu>
+
+ [EFL][GTK] Remove WebKit1 related codes
+ https://bugs.webkit.org/show_bug.cgi?id=136853
+
+ Reviewed by Csaba Osztrogonác.
+
+ Gtk and EFL WebKit1 ports no longer exist. Webkit1 related codes were deleted
+ from scripts.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (Compile32bitJSC):
+ (BuildAndTestWebKit2Factory):
+ (CompileWebKit1Only): Deleted.
+ (CompileWebKit2Only): Deleted.
+ (BuildAndTestWebKit1OnlyFactory): Deleted.
+ (BuildAndTestWebKit2OnlyFactory): Deleted.
+ * Scripts/build-webkit:
+ * Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl:
+ * Scripts/webkitpy/common/config/ports.py:
+ (GtkWK2Port.build_webkit_command):
+ (EflWK2Port.build_webkit_command):
+ * Scripts/webkitpy/common/config/ports_unittest.py:
+ (DeprecatedPortTest.test_gtk_wk2_port):
+ * Scripts/webkitpy/port/efl.py:
+ (EflPort.build_webkit_command):
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort._built_libraries_path):
+ (GtkPort._search_paths):
+ (GtkPort.test_expectations_file_position):
+ (GtkPort.build_webkit_command):
+ (GtkPort.run_webkit_tests_command):
+ (GtkPort.warn_if_bug_missing_in_test_expectations): Deleted.
+
</ins><span class="cx"> 2014-09-16 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add iOS SDK name and version suffix to WebKitSystemInterface debug/release product name
</span></span></pre></div>
<a id="trunkToolsScriptsbuildwebkit"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/build-webkit (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/build-webkit 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/build-webkit 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -59,8 +59,6 @@
</span><span class="cx"> my $makeArgs = "";
</span><span class="cx"> my $cmakeArgs = "";
</span><span class="cx"> my $onlyWebKitProject = 0;
</span><del>-my $noWebKit1 = 0;
-my $noWebKit2 = 0;
</del><span class="cx"> my $coverageSupport = 0;
</span><span class="cx"> my $shouldRunStaticAnalyzer = 0;
</span><span class="cx"> my $startTime = time();
</span><span class="lines">@@ -109,8 +107,6 @@
</span><span class="cx"> --minimal No optional features, unless explicitly enabled
</span><span class="cx">
</span><span class="cx"> --only-webkit Build only the WebKit project
</span><del>- --no-webkit1 Omit WebKit1 code from the build (EFL/GTK only)
- --no-webkit2 Omit WebKit2 code from the build
</del><span class="cx">
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="lines">@@ -124,8 +120,6 @@
</span><span class="cx"> 'cmakeargs=s' => \$cmakeArgs,
</span><span class="cx"> 'minimal' => \$minimal,
</span><span class="cx"> 'only-webkit' => \$onlyWebKitProject,
</span><del>- 'no-webkit1' => \$noWebKit1,
- 'no-webkit2' => \$noWebKit2,
</del><span class="cx"> 'coverage' => \$coverageSupport,
</span><span class="cx"> 'analyze' => \$shouldRunStaticAnalyzer,
</span><span class="cx"> );
</span><span class="lines">@@ -246,8 +240,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isCMakeBuild()) {
</span><del>- $cmakeArgs = "-DENABLE_WEBKIT=OFF " . $cmakeArgs if $noWebKit1;
- $cmakeArgs = "-DENABLE_WEBKIT2=OFF " . $cmakeArgs if $noWebKit2;
</del><span class="cx">
</span><span class="cx"> # By default we build using all of the available CPUs.
</span><span class="cx"> if (!isWinCE()) {
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlwebkitdirs_unittestcheckForArgumentAndRemoveFromArrayRefGettingValuepl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitperl/webkitdirs_unittest/checkForArgumentAndRemoveFromArrayRefGettingValue.pl 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> {
</span><span class="cx"> description => "option whose value is the empty string and follows an equal sign", # Unrecognized argument; no change
</span><span class="cx"> argToCheck => "--sdk",
</span><del>- args => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
- expectedArgs => ["--clean", "--debug", "--sdk=", "--no-webkit2"],
</del><ins>+ args => ["--clean", "--debug", "--sdk="],
+ expectedArgs => ["--clean", "--debug", "--sdk="],
</ins><span class="cx"> expectedReturn => undef,
</span><span class="cx"> },
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -145,7 +145,6 @@
</span><span class="cx"> command = super(GtkWK2Port, self).build_webkit_command(build_style=build_style)
</span><span class="cx"> command.append("--gtk")
</span><span class="cx"> command.append("--update-gtk")
</span><del>- command.append("--no-webkit1")
</del><span class="cx"> command.append(super(GtkWK2Port, self).makeArgs())
</span><span class="cx"> return command
</span><span class="cx">
</span><span class="lines">@@ -163,6 +162,5 @@
</span><span class="cx"> command = super(EflWK2Port, self).build_webkit_command(build_style=build_style)
</span><span class="cx"> command.append("--efl")
</span><span class="cx"> command.append("--update-efl")
</span><del>- command.append("--no-webkit1")
</del><span class="cx"> command.append(super(EflWK2Port, self).makeArgs())
</span><span class="cx"> return command
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigports_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -42,5 +42,5 @@
</span><span class="cx"> def test_gtk_wk2_port(self):
</span><span class="cx"> self.assertEqual(GtkWK2Port().flag(), "--port=gtk-wk2")
</span><span class="cx"> self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
</span><del>- self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
- self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
</del><ins>+ self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
+ self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", DeprecatedPort().makeArgs()])
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyporteflpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/efl.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -135,10 +135,6 @@
</span><span class="cx"> def build_webkit_command(self, build_style=None):
</span><span class="cx"> command = super(EflPort, self).build_webkit_command(build_style)
</span><span class="cx"> command.extend(["--efl", "--update-efl"])
</span><del>- if self.get_option('webkit_test_runner'):
- command.append("--no-webkit1")
- else:
- command.append("--no-webkit2")
</del><span class="cx"> command.append(super(EflPort, self).make_args())
</span><span class="cx"> return command
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -69,9 +69,6 @@
</span><span class="cx"> def _built_libraries_path(self, *path):
</span><span class="cx"> return self._build_path(*(('lib',) + path))
</span><span class="cx">
</span><del>- def warn_if_bug_missing_in_test_expectations(self):
- return not self.get_option('webkit_test_runner')
-
</del><span class="cx"> def _port_flag_for_scripts(self):
</span><span class="cx"> return "--gtk"
</span><span class="cx">
</span><span class="lines">@@ -177,11 +174,8 @@
</span><span class="cx">
</span><span class="cx"> def _search_paths(self):
</span><span class="cx"> search_paths = []
</span><del>- if self.get_option('webkit_test_runner'):
- search_paths.extend([self.port_name + '-wk2', 'wk2'])
- else:
- search_paths.append(self.port_name + '-wk1')
</del><span class="cx"> search_paths.append(self.port_name)
</span><ins>+ search_paths.append('wk2')
</ins><span class="cx"> search_paths.extend(self.get_option("additional_platform_directory", []))
</span><span class="cx"> return search_paths
</span><span class="cx">
</span><span class="lines">@@ -215,21 +209,17 @@
</span><span class="cx"> def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
</span><span class="cx"> return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
</span><span class="cx">
</span><ins>+ def test_expectations_file_position(self):
+ # GTK port baseline search path is gtk -> wk2 -> generic (as gtk-wk2 and gtk baselines are merged), so port test expectations file is at third to last position.
+ return 2
+
</ins><span class="cx"> def build_webkit_command(self, build_style=None):
</span><span class="cx"> command = super(GtkPort, self).build_webkit_command(build_style)
</span><span class="cx"> command.extend(["--gtk", "--update-gtk"])
</span><del>-
- if self.get_option('webkit_test_runner'):
- command.append("--no-webkit1")
- else:
- command.append("--no-webkit2")
-
</del><span class="cx"> command.append(super(GtkPort, self).make_args())
</span><span class="cx"> return command
</span><span class="cx">
</span><span class="cx"> def run_webkit_tests_command(self):
</span><span class="cx"> command = super(GtkPort, self).run_webkit_tests_command()
</span><span class="cx"> command.append("--gtk")
</span><del>- if self.get_option('webkit_test_runner'):
- command.append("-2")
</del><span class="cx"> return command
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtk_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -52,24 +52,14 @@
</span><span class="cx">
</span><span class="cx"> def test_default_baseline_search_path(self):
</span><span class="cx"> port = self.make_port()
</span><del>- self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk-wk1',
- '/mock-checkout/LayoutTests/platform/gtk'])
</del><ins>+ self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk',
+ '/mock-checkout/LayoutTests/platform/wk2'])
</ins><span class="cx">
</span><del>- port = self.make_port(options=MockOptions(webkit_test_runner=True))
- self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk-wk2',
- '/mock-checkout/LayoutTests/platform/wk2', '/mock-checkout/LayoutTests/platform/gtk'])
-
</del><span class="cx"> def test_port_specific_expectations_files(self):
</span><span class="cx"> port = self.make_port()
</span><span class="cx"> self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
</span><del>- '/mock-checkout/LayoutTests/platform/gtk/TestExpectations',
- '/mock-checkout/LayoutTests/platform/gtk-wk1/TestExpectations'])
-
- port = self.make_port(options=MockOptions(webkit_test_runner=True))
- self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
- '/mock-checkout/LayoutTests/platform/gtk/TestExpectations',
</del><span class="cx"> '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
</span><del>- '/mock-checkout/LayoutTests/platform/gtk-wk2/TestExpectations'])
</del><ins>+ '/mock-checkout/LayoutTests/platform/gtk/TestExpectations'])
</ins><span class="cx">
</span><span class="cx"> def test_show_results_html_file(self):
</span><span class="cx"> port = self.make_port()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsrebaseline_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (173688 => 173689)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-09-17 08:54:50 UTC (rev 173688)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-09-17 09:29:31 UTC (rev 173689)
</span><span class="lines">@@ -91,8 +91,8 @@
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
</span><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
</span><del>- self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
- self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk2")
</del><ins>+ self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
+ self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release (Tests)"), "/mock-checkout/LayoutTests/platform/gtk")
</ins><span class="cx"> self.assertMultiLineEqual(command._baseline_directory("EFL Linux 64-bit Release WK2"), "/mock-checkout/LayoutTests/platform/efl")
</span><span class="cx">
</span><span class="cx"> def test_rebaseline_updates_expectations_file_noop(self):
</span></span></pre>
</div>
</div>
</body>
</html>