Changeset 221376 in webkit
- Timestamp:
- Aug 30, 2017 10:18:09 AM (7 years ago)
- Location:
- trunk/Tools
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r221371 r221376 1 2017-08-30 Stephan Szabo <stephan.szabo@sony.com> 2 3 [Win][JSCOnly] Support running JSC tests for win-cairo from windows command prompt 4 https://bugs.webkit.org/show_bug.cgi?id=174985 5 6 Reviewed by Keith Miller. 7 8 * Scripts/run-javascriptcore-tests: 9 * Scripts/run-jsc-stress-tests: 10 * Scripts/webkitruby/jsc-stress-test-writer-default.rb: 11 * Scripts/webkitruby/jsc-stress-test-writer-ruby.rb: Added. 12 1 13 2017-08-30 Adrian Perez de Castro <aperez@igalia.com> 2 14 -
trunk/Tools/Scripts/run-javascriptcore-tests
r219984 r221376 53 53 my $shellRunner; 54 54 my $makeRunner; 55 my $rubyRunner; 56 my $testWriter; 55 57 my $memoryLimited; 56 58 … … 201 203 In general the shell runner is slower than the make runner. 202 204 --make-runner Uses the faster make-based runner. 205 --ruby-runner Uses the ruby runner for machines without unix shell or make. 206 207 --test-writer [writer] Specifies the test script format." 208 default is to use shell scripts to run the tests" 209 \"ruby\" to use ruby scripts for systems without a unix shell. 203 210 204 211 --memory-limited Indicate that we are targeting the test for a memory limited device. … … 248 255 'shell-runner' => \$shellRunner, 249 256 'make-runner' => \$makeRunner, 257 'ruby-runner' => \$rubyRunner, 258 'test-writer=s' => \$testWriter, 250 259 'memory-limited' => \$memoryLimited, 251 260 'filter=s' => \$filter, … … 470 479 } 471 480 481 if ($rubyRunner) { 482 push(@jscStressDriverCmd, "--ruby-runner"); 483 } 484 485 if ($testWriter) { 486 push(@jscStressDriverCmd, "--test-writer"); 487 push(@jscStressDriverCmd, $testWriter); 488 } 489 472 490 if ($memoryLimited) { 473 491 push(@jscStressDriverCmd, "--memory-limited"); -
trunk/Tools/Scripts/run-jsc-stress-tests
r220431 r221376 109 109 $copyVM = false 110 110 $testRunnerType = nil 111 $testWriter = "default" 111 112 $remoteUser = nil 112 113 $remoteHost = nil … … 143 144 puts " In general the shell runner is slower than the make runner." 144 145 puts "--make-runner Uses the faster make-based runner." 146 puts "--ruby-runner Uses the ruby runner for machines without unix shell or make." 147 puts "--test-writer [writer] Specifies the test script format." 148 puts " default is to use shell scripts to run the tests" 149 puts " \"ruby\" to use ruby scripts for systems without a unix shell." 145 150 puts "--remote Specify a remote host on which to run tests from command line argument." 146 151 puts "--remote-config-file Specify a remote host on which to run tests from JSON file." … … 172 177 ['--shell-runner', GetoptLong::NO_ARGUMENT], 173 178 ['--make-runner', GetoptLong::NO_ARGUMENT], 179 ['--ruby-runner', GetoptLong::NO_ARGUMENT], 180 ['--test-writer', GetoptLong::REQUIRED_ARGUMENT], 174 181 ['--remote', GetoptLong::REQUIRED_ARGUMENT], 175 182 ['--remote-config-file', GetoptLong::REQUIRED_ARGUMENT], … … 211 218 when '--make-runner' 212 219 $testRunnerType = :make 220 when '--ruby-runner' 221 $testRunnerType = :ruby 222 when '--test-writer' 223 $testWriter = arg 213 224 when '--remote' 214 225 $copyVM = true … … 424 435 end 425 436 437 if $testWriter 438 if /[^-a-zA-Z0-9_]/.match($testWriter) 439 raise "Invalid test writer #{$testWriter} given" 440 end 441 end 442 426 443 $numFailures = 0 427 444 $numPasses = 0 … … 435 452 FTL_OPTIONS = ["--useFTLJIT=true"] 436 453 437 require_relative "webkitruby/jsc-stress-test-writer- default"454 require_relative "webkitruby/jsc-stress-test-writer-#{$testWriter}" 438 455 439 456 def shouldCollectContinuously? … … 1627 1644 when :shell 1628 1645 prepareShellTestRunner 1646 when :ruby 1647 prepareRubyTestRunner 1629 1648 else 1630 1649 raise "Unknown test runner type: #{$testRunnerType.to_s}" -
trunk/Tools/Scripts/webkitruby/jsc-stress-test-writer-default.rb
r220431 r221376 345 345 end 346 346 347 def prepareRubyTestRunner 348 File.open($runnerDir + "runscript", "w") { 349 | outp | 350 $runlist.each { 351 | plan | 352 outp.puts "print `sh test_script_#{plan.index} 2>&1`" 353 } 354 } 355 end 356 347 357 def testRunnerCommand 348 358 case $testRunnerType … … 351 361 when :make 352 362 command = "make -j #{$numChildProcesses.to_s} -s -f Makefile" 363 when :ruby 364 command = "ruby runscript" 353 365 else 354 366 raise "Unknown test runner type: #{$testRunnerType.to_s}"
Note: See TracChangeset
for help on using the changeset viewer.