Diff
Modified: trunk/Tools/ChangeLog (183399 => 183400)
--- trunk/Tools/ChangeLog 2015-04-27 17:24:44 UTC (rev 183399)
+++ trunk/Tools/ChangeLog 2015-04-27 18:19:37 UTC (rev 183400)
@@ -1,5 +1,29 @@
2015-04-27 Csaba Osztrogonác <[email protected]>
+ 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 <[email protected]>
+
[buildbot] Fix the output of perf-test buildstep on timeout
https://bugs.webkit.org/show_bug.cgi?id=144097
Modified: trunk/Tools/Scripts/run-iexploder-tests (183399 => 183400)
--- 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)
@@ -102,7 +102,7 @@
close REDIRECT_HTML;
if (!isAppleWebKit()) {
- system "Tools/Scripts/run-launcher", "$iExploderTestDirectory/redirect.html";
+ system "Tools/Scripts/run-minibrowser", "$iExploderTestDirectory/redirect.html";
} else {
local %ENV;
$ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc;
Deleted: trunk/Tools/Scripts/run-launcher (183399 => 183400)
--- 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)
@@ -1,60 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright (C) 2007, 2013 Apple Inc. All rights reserved.
-# Copyright (C) 2007 Staikos Computing Services, Inc. <[email protected]>
-#
-# 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;
-
Modified: trunk/Tools/Scripts/run-minibrowser (183399 => 183400)
--- 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)
@@ -1,6 +1,8 @@
#!/usr/bin/perl -w
-# Copyright (C) 2005, 2007 Apple Inc. All rights reserved.
+# Copyright (C) 2005, 2007, 2013 Apple Inc. All rights reserved.
+# Copyright (C) 2007 Staikos Computing Services, Inc. <[email protected]>
+
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -29,12 +31,29 @@
# Simplified "run" script for launching the WebKit2 MiniBrowser.
use strict;
+use warnings;
+use File::Spec::Functions qw/catdir/;
use FindBin;
use lib $FindBin::Bin;
use webkitdirs;
-printHelpAndExitForRunAndDebugWebKitAppIfNeeded();
+my $launcherPath;
+my @jhbuildWrapper;
setConfiguration();
-exit exitStatus(runMiniBrowser());
+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."
+}
Modified: trunk/Tools/Scripts/webkitdirs.pm (183399 => 183400)
--- 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)
@@ -1366,7 +1366,7 @@
{
my $relativeScriptsPath = relativeScriptsDir();
if (isGtk() || isEfl()) {
- return "$relativeScriptsPath/run-launcher";
+ return "$relativeScriptsPath/run-minibrowser";
} elsif (isAppleWebKit()) {
return "$relativeScriptsPath/run-safari";
}
Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (183399 => 183400)
--- 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)
@@ -29,6 +29,7 @@
import os
+from webkitpy.common.system import path
from webkitpy.layout_tests.models.test_configuration import TestConfiguration
from webkitpy.port.base import Port
from webkitpy.port.pulseaudio_sanitizer import PulseAudioSanitizer
@@ -128,12 +129,7 @@
return list(reversed([self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in self._search_paths()]))
def show_results_html_file(self, results_filename):
- # 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)
+ self._run_script("run-minibrowser", [path.abspath_to_uri(self.host.platform, results_filename)])
def check_sys_deps(self, needs_http):
return super(EflPort, self).check_sys_deps(needs_http) and self._driver_class().check_driver(self)
Modified: trunk/Tools/Scripts/webkitpy/port/efl_unittest.py (183399 => 183400)
--- 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)
@@ -46,7 +46,7 @@
def test_show_results_html_file(self):
port = self.make_port()
port._executive = MockExecutive(should_log=True)
- expected_logs = "MOCK run_command: ['Tools/Scripts/run-launcher', '--release', '--efl', 'file://test.html'], cwd=/mock-checkout\n"
+ expected_logs = "MOCK run_command: ['Tools/Scripts/run-minibrowser', '--release', '--efl', 'file://test.html'], cwd=/mock-checkout\n"
OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_logs=expected_logs)
def test_get_crash_log(self):
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (183399 => 183400)
--- 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)
@@ -32,6 +32,7 @@
import uuid
import logging
+from webkitpy.common.system import path
from webkitpy.common.memoized import memoized
from webkitpy.layout_tests.models.test_configuration import TestConfiguration
from webkitpy.port.base import Port
@@ -198,13 +199,8 @@
return
self._leakdetector.parse_and_print_leaks_detail(leaks_files)
- # 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.
def show_results_html_file(self, results_filename):
- 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)
+ self._run_script("run-minibrowser", [path.abspath_to_uri(self.host.platform, results_filename)])
def check_sys_deps(self, needs_http):
return super(GtkPort, self).check_sys_deps(needs_http) and self._driver_class().check_driver(self)
Modified: trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py (183399 => 183400)
--- 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)
@@ -64,7 +64,7 @@
def test_show_results_html_file(self):
port = self.make_port()
port._executive = MockExecutive(should_log=True)
- expected_logs = "MOCK run_command: ['Tools/Scripts/run-launcher', '--release', '--gtk', 'file://test.html'], cwd=/mock-checkout\n"
+ expected_logs = "MOCK run_command: ['Tools/Scripts/run-minibrowser', '--release', '--gtk', 'file://test.html'], cwd=/mock-checkout\n"
OutputCapture().assert_outputs(self, port.show_results_html_file, ["test.html"], expected_logs=expected_logs)
def test_default_timeout_ms(self):
