<!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>[170426] trunk/Tools</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/170426">170426</a></dd>
<dt>Author</dt> <dd>m.pakula@samsung.com</dd>
<dt>Date</dt> <dd>2014-06-25 05:25:20 -0700 (Wed, 25 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Remove WebKit1 related code from scripts
https://bugs.webkit.org/show_bug.cgi?id=134195
Reviewed by Laszlo Gombos.
After removing WebKit1 from EFL port, still there is some code left related to DumpRenderTree,
EWebLauncher. Also running layout tests does not require adding -2/--webkit-test-runner switch.
* Scripts/run-launcher: MiniBrowser now runs as default without -2 switch.
* Scripts/webkitdirs.pm:
(builtDylibPathForName): Remove reference to libewebkit.so
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(_set_up_derived_options): Script runs WKTR by default.
* Scripts/webkitpy/performance_tests/perftestsrunner.py:
(PerfTestsRunner.__init__): Ditto.
* Scripts/webkitpy/port/efl.py:
(EflPort._search_paths): Remove efl-wk2 from baseline search path.
(EflPort.show_results_html_file): Run MiniBrowser as result viewer.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunlauncher">trunk/Tools/Scripts/run-launcher</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyperformance_testsperftestsrunnerpy">trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyporteflpy">trunk/Tools/Scripts/webkitpy/port/efl.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (170425 => 170426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-25 12:04:42 UTC (rev 170425)
+++ trunk/Tools/ChangeLog 2014-06-25 12:25:20 UTC (rev 170426)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-06-25 Michał Pakuła vel Rutka <m.pakula@samsung.com>
+
+ [EFL] Remove WebKit1 related code from scripts
+ https://bugs.webkit.org/show_bug.cgi?id=134195
+
+ Reviewed by Laszlo Gombos.
+
+ After removing WebKit1 from EFL port, still there is some code left related to DumpRenderTree,
+ EWebLauncher. Also running layout tests does not require adding -2/--webkit-test-runner switch.
+
+ * Scripts/run-launcher: MiniBrowser now runs as default without -2 switch.
+ * Scripts/webkitdirs.pm:
+ (builtDylibPathForName): Remove reference to libewebkit.so
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (_set_up_derived_options): Script runs WKTR by default.
+ * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+ (PerfTestsRunner.__init__): Ditto.
+ * Scripts/webkitpy/port/efl.py:
+ (EflPort._search_paths): Remove efl-wk2 from baseline search path.
+ (EflPort.show_results_html_file): Run MiniBrowser as result viewer.
+
</ins><span class="cx"> 2014-06-25 Laszlo Gombos <l.gombos@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove build guard for progress element
</span></span></pre></div>
<a id="trunkToolsScriptsrunlauncher"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-launcher (170425 => 170426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-launcher 2014-06-25 12:04:42 UTC (rev 170425)
+++ trunk/Tools/Scripts/run-launcher 2014-06-25 12:25:20 UTC (rev 170426)
</span><span class="lines">@@ -45,14 +45,8 @@
</span><span class="cx"> checkFrameworks();
</span><span class="cx">
</span><span class="cx"> # Set paths according to the build system used
</span><del>-if (isGtk()) {
</del><ins>+if (isGtk() || isEfl()) {
</ins><span class="cx"> $launcherPath = catdir($productDir, "bin", "MiniBrowser");
</span><del>-} elsif (isEfl()) {
- if (isWK2()) {
- $launcherPath = catdir($productDir, "bin", "MiniBrowser");
- } else {
- $launcherPath = catdir($productDir, "bin", "EWebLauncher");
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $launcherPath && -x $launcherPath or die "Can't find the launcher command";
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (170425 => 170426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-06-25 12:04:42 UTC (rev 170425)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-06-25 12:25:20 UTC (rev 170426)
</span><span class="lines">@@ -829,10 +829,7 @@
</span><span class="cx"> return "NotFound";
</span><span class="cx"> }
</span><span class="cx"> if (isEfl()) {
</span><del>- if (isWK2()) {
- return "$configurationProductDir/lib/libewebkit2.so";
- }
- return "$configurationProductDir/lib/libewebkit.so";
</del><ins>+ return "$configurationProductDir/lib/libewebkit2.so";
</ins><span class="cx"> }
</span><span class="cx"> if (isWinCE()) {
</span><span class="cx"> return "$configurationProductDir/$libraryName";
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (170425 => 170426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2014-06-25 12:04:42 UTC (rev 170425)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2014-06-25 12:25:20 UTC (rev 170426)
</span><span class="lines">@@ -382,8 +382,8 @@
</span><span class="cx"> if options.run_singly:
</span><span class="cx"> options.verbose = True
</span><span class="cx">
</span><del>- # The GTK+ port only support WebKit2 so it always uses WKTR.
- if options.platform == "gtk":
</del><ins>+ # The GTK+ and EFL ports only support WebKit2 so they always use WKTR.
+ if options.platform == "gtk" or options.platform == "efl":
</ins><span class="cx"> options.webkit_test_runner = True
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyperformance_testsperftestsrunnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (170425 => 170426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2014-06-25 12:04:42 UTC (rev 170425)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2014-06-25 12:25:20 UTC (rev 170426)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx"> self._host = Host()
</span><span class="cx"> self._port = self._host.port_factory.get(self._options.platform, self._options)
</span><span class="cx">
</span><del>- # The GTK+ port only supports WebKit2, so it always uses WKTR.
- if self._port.name().startswith("gtk"):
</del><ins>+ # The GTK+ and EFL ports only supports WebKit2, so they always use WKTR.
+ if self._port.name().startswith("gtk") or self._port.name().startswith("efl"):
</ins><span class="cx"> self._options.webkit_test_runner = True
</span><span class="cx">
</span><span class="cx"> self._host.initialize_scm()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporteflpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (170425 => 170426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/efl.py 2014-06-25 12:04:42 UTC (rev 170425)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2014-06-25 12:25:20 UTC (rev 170426)
</span><span class="lines">@@ -110,11 +110,7 @@
</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.append(self.port_name + '-wk2')
- search_paths.append('wk2')
- else:
- search_paths.append(self.port_name + '-wk1')
</del><ins>+ search_paths.append('wk2')
</ins><span class="cx"> search_paths.append(self.port_name)
</span><span class="cx"> return search_paths
</span><span class="cx">
</span><span class="lines">@@ -129,8 +125,6 @@
</span><span class="cx"> # FIXME: We should find a way to share this implmentation with Gtk,
</span><span class="cx"> # or teach run-launcher how to call run-safari and move this down to WebKitPort.
</span><span class="cx"> run_launcher_args = ["file://%s" % results_filename]
</span><del>- if self.get_option('webkit_test_runner'):
- run_launcher_args.append('-2')
</del><span class="cx"> # FIXME: old-run-webkit-tests also added ["-graphicssystem", "raster", "-style", "windows"]
</span><span class="cx"> # FIXME: old-run-webkit-tests converted results_filename path for cygwin.
</span><span class="cx"> self._run_script("run-launcher", run_launcher_args)
</span></span></pre>
</div>
</div>
</body>
</html>