<!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>[161509] 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/161509">161509</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-08 09:14:02 -0800 (Wed, 08 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove run-webkit-tests wrapper script as all platform are using NRWT now.
https://bugs.webkit.org/show_bug.cgi?id=126580
Patch by Peter Molnar <pmolnar.u-szeged@partner.samsung.com> on 2014-01-08
Reviewed by Csaba Osztrogonác.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests): Passing --debug-rwt-logging here instead of the
run-webkit-tests script.
* Scripts/new-run-webkit-tests: Renamed to run-webkit-tests.
* Scripts/run-webkit-tests: Removed, as it was just a temporary hack.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkToolsScriptsrunwebkittests">trunk/Tools/Scripts/run-webkit-tests</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsScriptsnewrunwebkittests">trunk/Tools/Scripts/new-run-webkit-tests</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (161508 => 161509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-01-08 16:42:57 UTC (rev 161508)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-01-08 17:14:02 UTC (rev 161509)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx"> name = "layout-test"
</span><span class="cx"> description = ["layout-tests running"]
</span><span class="cx"> descriptionDone = ["layout-tests"]
</span><del>- command = ["perl", "./Tools/Scripts/run-webkit-tests",
</del><ins>+ command = ["python", "./Tools/Scripts/run-webkit-tests",
</ins><span class="cx"> "--no-show-results",
</span><span class="cx"> "--no-new-test-results",
</span><span class="cx"> "--no-sample-on-timeout",
</span><span class="lines">@@ -357,6 +357,7 @@
</span><span class="cx"> "--build-number", WithProperties("%(buildnumber)s"),
</span><span class="cx"> "--master-name", "webkit.org",
</span><span class="cx"> "--test-results-server", "webkit-test-results.appspot.com",
</span><ins>+ "--debug-rwt-logging",
</ins><span class="cx"> WithProperties("--%(configuration)s")]
</span><span class="cx">
</span><span class="cx"> def __init__(self, buildJSCTool=True, *args, **kwargs):
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161508 => 161509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-08 16:42:57 UTC (rev 161508)
+++ trunk/Tools/ChangeLog 2014-01-08 17:14:02 UTC (rev 161509)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2014-01-08 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><ins>+ Remove run-webkit-tests wrapper script as all platform are using NRWT now.
+ https://bugs.webkit.org/show_bug.cgi?id=126580
+
+ Reviewed by Csaba Osztrogonác.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunWebKitTests): Passing --debug-rwt-logging here instead of the
+ run-webkit-tests script.
+ * Scripts/new-run-webkit-tests: Renamed to run-webkit-tests.
+ * Scripts/run-webkit-tests: Removed, as it was just a temporary hack.
+
+2014-01-08 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
+
</ins><span class="cx"> Update the list of non-committer u-szeged contributors
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126640
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptsnewrunwebkittests"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/Scripts/new-run-webkit-tests (161508 => 161509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/new-run-webkit-tests 2014-01-08 16:42:57 UTC (rev 161508)
+++ trunk/Tools/Scripts/new-run-webkit-tests 2014-01-08 17:14:02 UTC (rev 161509)
</span><span class="lines">@@ -1,33 +0,0 @@
</span><del>-#!/usr/bin/env python
-# Copyright (C) 2011 Google Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * 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.
-# * Neither the name of Google Inc. 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-# OWNER OR 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.
-
-"""Wrapper around webkitpy/layout_tests/run_webkit_tests.py"""
-from webkitpy.common import multiprocessing_bootstrap
-
-multiprocessing_bootstrap.run('webkitpy', 'layout_tests', 'run_webkit_tests.py')
</del></span></pre></div>
<a id="trunkToolsScriptsrunwebkittests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-webkit-tests (161508 => 161509)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-webkit-tests 2014-01-08 16:42:57 UTC (rev 161508)
+++ trunk/Tools/Scripts/run-webkit-tests 2014-01-08 17:14:02 UTC (rev 161509)
</span><span class="lines">@@ -1,7 +1,5 @@
</span><del>-#!/usr/bin/perl -w
-# Copyright (C) 2010 Google Inc. All rights reserved.
-# Copyright (C) 2013 Apple Inc. All rights reserved.
-# Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
</del><ins>+#!/usr/bin/env python
+# Copyright (C) 2011 Google Inc. All rights reserved.
</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 are
</span><span class="lines">@@ -29,65 +27,7 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-# This file is a temporary hack.
-# It will be removed as soon as all platforms are are ready to move to
-# new-run-webkit-tests and we can then update the buildbots to explicitly
-# call old-run-webkit-tests for any platforms which will never support
-# a Python run-webkit-tests.
</del><ins>+"""Wrapper around webkitpy/layout_tests/run_webkit_tests.py"""
+from webkitpy.common import multiprocessing_bootstrap
</ins><span class="cx">
</span><del>-# This is intentionally written in Perl to guarantee support on
-# the same set of platforms as old-run-webkit-tests currently supports.
-# The buildbot master.cfg also currently passes run-webkit-tests to
-# perl directly instead of executing it in a shell.
-
-use strict;
-use warnings;
-
-use File::Spec;
-use FindBin;
-use lib $FindBin::Bin;
-use webkitdirs;
-
-sub runningOnBuildBot()
-{
- # This is a hack to detect if we're running on the buildbot so we can
- # pass --verbose to new-run-webkit-tests. This will be removed when we
- # update the buildbot config to call new-run-webkit-tests explicitly.
- my %isBuildBotUser = ("apple" => 1, "buildbot" => 1, "webkitbuildbot" => 1, "slave" => 1, "buildslave-1" => 1, "chrome-bot" => 1);
- return $isBuildBotUser{$ENV{"USER"}};
-}
-
-sub useNewRunWebKitTests()
-{
- # All platforms should use NRWT by default.
- return 1;
-}
-
-my $script = "perl";
-my $harnessName = "old-run-webkit-tests";
-
-if (useNewRunWebKitTests()) {
- $script = "python";
- $harnessName = "new-run-webkit-tests";
-
- if (runningOnBuildBot()) {
- push(@ARGV, "--debug-rwt-logging");
- }
-}
-
-# webkitdirs.pm strips --gtk from @ARGV when we call isGtk.
-# We have to add back any --PORT arguments which may have been removed by isPort() checks above.
-if (isGtk()) {
- push(@ARGV, "--gtk");
-} elsif (isEfl()) {
- push(@ARGV, "--efl");
-} elsif (isNix()) {
- push(@ARGV, "--nix");
-} elsif (isWinCairo()) {
- push(@ARGV, "--wincairo");
-}
-
-my $harnessPath = File::Spec->catfile(relativeScriptsDir(), $harnessName);
-unshift(@ARGV, $harnessPath);
-unshift(@ARGV, $script);
-system(@ARGV) == 0 or die "Failed to execute $harnessPath";
</del><ins>+multiprocessing_bootstrap.run('webkitpy', 'layout_tests', 'run_webkit_tests.py')
</ins></span></pre>
</div>
</div>
</body>
</html>