- Revision
- 161509
- Author
- [email protected]
- Date
- 2014-01-08 09:14:02 -0800 (Wed, 08 Jan 2014)
Log Message
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 <[email protected]> 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.
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (161508 => 161509)
--- 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)
@@ -348,7 +348,7 @@
name = "layout-test"
description = ["layout-tests running"]
descriptionDone = ["layout-tests"]
- command = ["perl", "./Tools/Scripts/run-webkit-tests",
+ command = ["python", "./Tools/Scripts/run-webkit-tests",
"--no-show-results",
"--no-new-test-results",
"--no-sample-on-timeout",
@@ -357,6 +357,7 @@
"--build-number", WithProperties("%(buildnumber)s"),
"--master-name", "webkit.org",
"--test-results-server", "webkit-test-results.appspot.com",
+ "--debug-rwt-logging",
WithProperties("--%(configuration)s")]
def __init__(self, buildJSCTool=True, *args, **kwargs):
Modified: trunk/Tools/ChangeLog (161508 => 161509)
--- trunk/Tools/ChangeLog 2014-01-08 16:42:57 UTC (rev 161508)
+++ trunk/Tools/ChangeLog 2014-01-08 17:14:02 UTC (rev 161509)
@@ -1,5 +1,18 @@
2014-01-08 Peter Molnar <[email protected]>
+ 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 <[email protected]>
+
Update the list of non-committer u-szeged contributors
https://bugs.webkit.org/show_bug.cgi?id=126640
Deleted: trunk/Tools/Scripts/new-run-webkit-tests (161508 => 161509)
--- 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)
@@ -1,33 +0,0 @@
-#!/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')
Modified: trunk/Tools/Scripts/run-webkit-tests (161508 => 161509)
--- 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)
@@ -1,7 +1,5 @@
-#!/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).
+#!/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
@@ -29,65 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# 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.
+"""Wrapper around webkitpy/layout_tests/run_webkit_tests.py"""
+from webkitpy.common import multiprocessing_bootstrap
-# 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";
+multiprocessing_bootstrap.run('webkitpy', 'layout_tests', 'run_webkit_tests.py')
