<!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>[183400] 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/183400">183400</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-27 11:19:37 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge run-launcher into run-minibrowser
https://bugs.webkit.org/show_bug.cgi?id=141928
Reviewed by Darin Adler.
* Scripts/run-iexploder-tests:
(runSafariWithIExploder):
* Scripts/run-launcher: Removed.
* Scripts/run-minibrowser:
* Scripts/webkitdirs.pm:
(launcherPath):
* Scripts/webkitpy/port/efl.py:
(EflPort.show_results_html_file):
* Scripts/webkitpy/port/efl_unittest.py:
(EflPortTest.test_show_results_html_file):
* Scripts/webkitpy/port/gtk.py:
(GtkPort.print_leaks_summary):
(GtkPort.show_results_html_file):
(GtkPort): Deleted.
* Scripts/webkitpy/port/gtk_unittest.py:
(GtkPortTest.test_show_results_html_file):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsruniexplodertests">trunk/Tools/Scripts/run-iexploder-tests</a></li>
<li><a href="#trunkToolsScriptsrunminibrowser">trunk/Tools/Scripts/run-minibrowser</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsScriptswebkitpyporteflpy">trunk/Tools/Scripts/webkitpy/port/efl.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportefl_unittestpy">trunk/Tools/Scripts/webkitpy/port/efl_unittest.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>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsScriptsrunlauncher">trunk/Tools/Scripts/run-launcher</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/ChangeLog 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-04-27 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><ins>+ Merge run-launcher into run-minibrowser
+ https://bugs.webkit.org/show_bug.cgi?id=141928
+
+ Reviewed by Darin Adler.
+
+ * Scripts/run-iexploder-tests:
+ (runSafariWithIExploder):
+ * Scripts/run-launcher: Removed.
+ * Scripts/run-minibrowser:
+ * Scripts/webkitdirs.pm:
+ (launcherPath):
+ * Scripts/webkitpy/port/efl.py:
+ (EflPort.show_results_html_file):
+ * Scripts/webkitpy/port/efl_unittest.py:
+ (EflPortTest.test_show_results_html_file):
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.print_leaks_summary):
+ (GtkPort.show_results_html_file):
+ (GtkPort): Deleted.
+ * Scripts/webkitpy/port/gtk_unittest.py:
+ (GtkPortTest.test_show_results_html_file):
+
+2015-04-27 Csaba Osztrogonác <ossy@webkit.org>
+
</ins><span class="cx"> [buildbot] Fix the output of perf-test buildstep on timeout
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144097
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsruniexplodertests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-iexploder-tests (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-iexploder-tests 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/run-iexploder-tests 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> close REDIRECT_HTML;
</span><span class="cx">
</span><span class="cx"> if (!isAppleWebKit()) {
</span><del>- system "Tools/Scripts/run-launcher", "$iExploderTestDirectory/redirect.html";
</del><ins>+ system "Tools/Scripts/run-minibrowser", "$iExploderTestDirectory/redirect.html";
</ins><span class="cx"> } else {
</span><span class="cx"> local %ENV;
</span><span class="cx"> $ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc;
</span></span></pre></div>
<a id="trunkToolsScriptsrunlauncher"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/run-launcher (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-launcher 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/run-launcher 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-#!/usr/bin/env perl
-
-# Copyright (C) 2007, 2013 Apple Inc. All rights reserved.
-# Copyright (C) 2007 Staikos Computing Services, Inc. <info@staikos.net>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-# 3. Neither the name of Apple Inc. ("Apple") nor the names of
-# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Simplified "run" script for WebKit Open Source Project.
-
-use strict;
-use warnings;
-use File::Spec::Functions qw/catdir/;
-use File::Temp qw/tempfile/;
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-setConfiguration();
-my $productDir = productDir();
-my $launcherPath;
-my @jhbuildWrapper;
-
-# Check to see that all the frameworks are built.
-checkFrameworks();
-
-# Set paths according to the build system used
-if (isGtk() || isEfl()) {
- $launcherPath = catdir($productDir, "bin", "MiniBrowser");
-}
-
-$launcherPath && -x $launcherPath or die "Can't find the launcher command";
-
-@jhbuildWrapper = jhbuildWrapperPrefixIfNeeded();
-
-print "Starting webkit launcher.\n";
-
-exec @jhbuildWrapper, $launcherPath, @ARGV or die;
-
</del></span></pre></div>
<a id="trunkToolsScriptsrunminibrowser"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-minibrowser (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-minibrowser 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/run-minibrowser 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> #!/usr/bin/perl -w
</span><span class="cx">
</span><del>-# Copyright (C) 2005, 2007 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2005, 2007, 2013 Apple Inc. All rights reserved.
+# Copyright (C) 2007 Staikos Computing Services, Inc. <info@staikos.net>
+
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,12 +31,29 @@
</span><span class="cx"> # Simplified "run" script for launching the WebKit2 MiniBrowser.
</span><span class="cx">
</span><span class="cx"> use strict;
</span><ins>+use warnings;
+use File::Spec::Functions qw/catdir/;
</ins><span class="cx"> use FindBin;
</span><span class="cx"> use lib $FindBin::Bin;
</span><span class="cx"> use webkitdirs;
</span><span class="cx">
</span><del>-printHelpAndExitForRunAndDebugWebKitAppIfNeeded();
</del><ins>+my $launcherPath;
+my @jhbuildWrapper;
</ins><span class="cx">
</span><span class="cx"> setConfiguration();
</span><span class="cx">
</span><del>-exit exitStatus(runMiniBrowser());
</del><ins>+if (isGtk() || isEfl()) {
+ # Check to see that all the frameworks are built.
+ checkFrameworks();
+
+ $launcherPath = catdir(productDir(), "bin", "MiniBrowser");
+ die "Can't find $launcherPath" unless -x $launcherPath;
+ @jhbuildWrapper = jhbuildWrapperPrefixIfNeeded();
+ print "Starting MiniBrowser.\n";
+ exec @jhbuildWrapper, $launcherPath, @ARGV or die;
+} elsif (isAppleMacWebKit()) {
+ printHelpAndExitForRunAndDebugWebKitAppIfNeeded();
+ exit exitStatus(runMiniBrowser());
+} else {
+ die "Unsupported platform."
+}
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/webkitdirs.pm 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -1366,7 +1366,7 @@
</span><span class="cx"> {
</span><span class="cx"> my $relativeScriptsPath = relativeScriptsDir();
</span><span class="cx"> if (isGtk() || isEfl()) {
</span><del>- return "$relativeScriptsPath/run-launcher";
</del><ins>+ return "$relativeScriptsPath/run-minibrowser";
</ins><span class="cx"> } elsif (isAppleWebKit()) {
</span><span class="cx"> return "$relativeScriptsPath/run-safari";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporteflpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/efl.py 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> import os
</span><span class="cx">
</span><ins>+from webkitpy.common.system import path
</ins><span class="cx"> from webkitpy.layout_tests.models.test_configuration import TestConfiguration
</span><span class="cx"> from webkitpy.port.base import Port
</span><span class="cx"> from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
</span><span class="lines">@@ -128,12 +129,7 @@
</span><span class="cx"> return list(reversed([self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in self._search_paths()]))
</span><span class="cx">
</span><span class="cx"> def show_results_html_file(self, results_filename):
</span><del>- # FIXME: We should find a way to share this implmentation with Gtk,
- # or teach run-launcher how to call run-safari and move this down to WebKitPort.
- run_launcher_args = ["file://%s" % results_filename]
- # FIXME: old-run-webkit-tests also added ["-graphicssystem", "raster", "-style", "windows"]
- # FIXME: old-run-webkit-tests converted results_filename path for cygwin.
- self._run_script("run-launcher", run_launcher_args)
</del><ins>+ self._run_script("run-minibrowser", [path.abspath_to_uri(self.host.platform, results_filename)])
</ins><span class="cx">
</span><span class="cx"> def check_sys_deps(self, needs_http):
</span><span class="cx"> return super(EflPort, self).check_sys_deps(needs_http) and self._driver_class().check_driver(self)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportefl_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/efl_unittest.py (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/efl_unittest.py 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/webkitpy/port/efl_unittest.py 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> def test_show_results_html_file(self):
</span><span class="cx"> port = self.make_port()
</span><span class="cx"> port._executive = MockExecutive(should_log=True)
</span><del>- expected_logs = "MOCK run_command: ['Tools/Scripts/run-launcher', '--release', '--efl', 'file://test.html'], cwd=/mock-checkout\n"
</del><ins>+ expected_logs = "MOCK run_command: ['Tools/Scripts/run-minibrowser', '--release', '--efl', 'file://test.html'], cwd=/mock-checkout\n"
</ins><span class="cx"> OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_logs=expected_logs)
</span><span class="cx">
</span><span class="cx"> def test_get_crash_log(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> import uuid
</span><span class="cx"> import logging
</span><span class="cx">
</span><ins>+from webkitpy.common.system import path
</ins><span class="cx"> from webkitpy.common.memoized import memoized
</span><span class="cx"> from webkitpy.layout_tests.models.test_configuration import TestConfiguration
</span><span class="cx"> from webkitpy.port.base import Port
</span><span class="lines">@@ -198,13 +199,8 @@
</span><span class="cx"> return
</span><span class="cx"> self._leakdetector.parse_and_print_leaks_detail(leaks_files)
</span><span class="cx">
</span><del>- # FIXME: We should find a way to share this implmentation with Gtk,
- # or teach run-launcher how to call run-safari and move this down to Port.
</del><span class="cx"> def show_results_html_file(self, results_filename):
</span><del>- run_launcher_args = ["file://%s" % results_filename]
- # FIXME: old-run-webkit-tests also added ["-graphicssystem", "raster", "-style", "windows"]
- # FIXME: old-run-webkit-tests converted results_filename path for cygwin.
- self._run_script("run-launcher", run_launcher_args)
</del><ins>+ self._run_script("run-minibrowser", [path.abspath_to_uri(self.host.platform, results_filename)])
</ins><span class="cx">
</span><span class="cx"> def check_sys_deps(self, needs_http):
</span><span class="cx"> return super(GtkPort, self).check_sys_deps(needs_http) and self._driver_class().check_driver(self)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtk_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py (183399 => 183400)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py 2015-04-27 18:19:37 UTC (rev 183400)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> def test_show_results_html_file(self):
</span><span class="cx"> port = self.make_port()
</span><span class="cx"> port._executive = MockExecutive(should_log=True)
</span><del>- expected_logs = "MOCK run_command: ['Tools/Scripts/run-launcher', '--release', '--gtk', 'file://test.html'], cwd=/mock-checkout\n"
</del><ins>+ expected_logs = "MOCK run_command: ['Tools/Scripts/run-minibrowser', '--release', '--gtk', 'file://test.html'], cwd=/mock-checkout\n"
</ins><span class="cx"> OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_logs=expected_logs)
</span><span class="cx">
</span><span class="cx"> def test_default_timeout_ms(self):
</span></span></pre>
</div>
</div>
</body>
</html>