Changeset 161509 in webkit
- Timestamp:
- Jan 8, 2014 9:14:02 AM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 1 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
r161462 r161509 349 349 description = ["layout-tests running"] 350 350 descriptionDone = ["layout-tests"] 351 command = ["p erl", "./Tools/Scripts/run-webkit-tests",351 command = ["python", "./Tools/Scripts/run-webkit-tests", 352 352 "--no-show-results", 353 353 "--no-new-test-results", … … 358 358 "--master-name", "webkit.org", 359 359 "--test-results-server", "webkit-test-results.appspot.com", 360 "--debug-rwt-logging", 360 361 WithProperties("--%(configuration)s")] 361 362 -
trunk/Tools/ChangeLog
r161502 r161509 1 2014-01-08 Peter Molnar <pmolnar.u-szeged@partner.samsung.com> 2 3 Remove run-webkit-tests wrapper script as all platform are using NRWT now. 4 https://bugs.webkit.org/show_bug.cgi?id=126580 5 6 Reviewed by Csaba Osztrogonác. 7 8 * BuildSlaveSupport/build.webkit.org-config/master.cfg: 9 (RunWebKitTests): Passing --debug-rwt-logging here instead of the 10 run-webkit-tests script. 11 * Scripts/new-run-webkit-tests: Renamed to run-webkit-tests. 12 * Scripts/run-webkit-tests: Removed, as it was just a temporary hack. 13 1 14 2014-01-08 Peter Molnar <pmolnar.u-szeged@partner.samsung.com> 2 15 -
trunk/Tools/Scripts/run-webkit-tests
r159806 r161509 1 #!/usr/bin/perl -w 2 # Copyright (C) 2010 Google Inc. All rights reserved. 3 # Copyright (C) 2013 Apple Inc. All rights reserved. 4 # Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 1 #!/usr/bin/env python 2 # Copyright (C) 2011 Google Inc. All rights reserved. 5 3 # 6 4 # Redistribution and use in source and binary forms, with or without … … 30 28 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 29 32 # This file is a temporary hack. 33 # It will be removed as soon as all platforms are are ready to move to 34 # new-run-webkit-tests and we can then update the buildbots to explicitly 35 # call old-run-webkit-tests for any platforms which will never support 36 # a Python run-webkit-tests. 30 """Wrapper around webkitpy/layout_tests/run_webkit_tests.py""" 31 from webkitpy.common import multiprocessing_bootstrap 37 32 38 # This is intentionally written in Perl to guarantee support on 39 # the same set of platforms as old-run-webkit-tests currently supports. 40 # The buildbot master.cfg also currently passes run-webkit-tests to 41 # perl directly instead of executing it in a shell. 42 43 use strict; 44 use warnings; 45 46 use File::Spec; 47 use FindBin; 48 use lib $FindBin::Bin; 49 use webkitdirs; 50 51 sub runningOnBuildBot() 52 { 53 # This is a hack to detect if we're running on the buildbot so we can 54 # pass --verbose to new-run-webkit-tests. This will be removed when we 55 # update the buildbot config to call new-run-webkit-tests explicitly. 56 my %isBuildBotUser = ("apple" => 1, "buildbot" => 1, "webkitbuildbot" => 1, "slave" => 1, "buildslave-1" => 1, "chrome-bot" => 1); 57 return $isBuildBotUser{$ENV{"USER"}}; 58 } 59 60 sub useNewRunWebKitTests() 61 { 62 # All platforms should use NRWT by default. 63 return 1; 64 } 65 66 my $script = "perl"; 67 my $harnessName = "old-run-webkit-tests"; 68 69 if (useNewRunWebKitTests()) { 70 $script = "python"; 71 $harnessName = "new-run-webkit-tests"; 72 73 if (runningOnBuildBot()) { 74 push(@ARGV, "--debug-rwt-logging"); 75 } 76 } 77 78 # webkitdirs.pm strips --gtk from @ARGV when we call isGtk. 79 # We have to add back any --PORT arguments which may have been removed by isPort() checks above. 80 if (isGtk()) { 81 push(@ARGV, "--gtk"); 82 } elsif (isEfl()) { 83 push(@ARGV, "--efl"); 84 } elsif (isNix()) { 85 push(@ARGV, "--nix"); 86 } elsif (isWinCairo()) { 87 push(@ARGV, "--wincairo"); 88 } 89 90 my $harnessPath = File::Spec->catfile(relativeScriptsDir(), $harnessName); 91 unshift(@ARGV, $harnessPath); 92 unshift(@ARGV, $script); 93 system(@ARGV) == 0 or die "Failed to execute $harnessPath"; 33 multiprocessing_bootstrap.run('webkitpy', 'layout_tests', 'run_webkit_tests.py')
Note: See TracChangeset
for help on using the changeset viewer.