Changeset 247428 in webkit
- Timestamp:
- Jul 15, 2019 4:58:53 AM (5 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py
r247393 r247428 332 332 def start(self): 333 333 platform = self.getProperty('platform') 334 architecture = self.getProperty("architecture")335 # Currently run-javascriptcore-test doesn't support run those binaries remotely336 if architecture in ['mips', 'armv7', 'aarch64']:337 self.command += ['--no-testmasm', '--no-testair', '--no-testb3', '--no-testdfg', '--no-testapi']338 334 # Linux bots have currently problems with JSC tests that try to use large amounts of memory. 339 335 # Check: https://bugs.webkit.org/show_bug.cgi?id=175140 … … 349 345 def countFailures(self, cmd): 350 346 logText = cmd.logs['stdio'].getText() 351 count = 0352 347 353 348 match = re.search(r'^Results for JSC stress tests:\r?\n\s+(\d+) failure', logText, re.MULTILINE) 354 349 if match: 355 count += int(match.group(1)) 356 357 match = re.search(r'Results for JSC test binaries:\r?\n\s+(\d+) failure', logText, re.MULTILINE) 358 if match: 359 count += int(match.group(1)) 350 return int(match.group(1)) 360 351 361 352 match = re.search(r'^Results for Mozilla tests:\r?\n\s+(\d+) regression', logText, re.MULTILINE) 362 353 if match: 363 count +=int(match.group(1))364 365 return count354 return int(match.group(1)) 355 356 return 0 366 357 367 358 -
trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py
r247393 r247428 123 123 5 failures found.""") 124 124 125 def test_jsc_stress_failures_with_binary_results_output(self):126 self.assertResults(FAILURE, ["8 JSC tests failed"], 1, """Results for JSC stress tests:127 5 failures found.128 Results for JSC test binaries:129 3 failures found.""")130 131 def test_jsc_stress_failures_with_binary_result_output(self):132 self.assertResults(FAILURE, ["6 JSC tests failed"], 1, """Results for JSC stress tests:133 5 failures found.134 Results for JSC test binaries:135 1 failure found.""")136 137 125 138 126 class RunTest262TestsTest(unittest.TestCase): -
trunk/Tools/ChangeLog
r247414 r247428 1 2019-07-15 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r247393. 4 https://bugs.webkit.org/show_bug.cgi?id=199797 5 6 broke mips and arm EWS (Requested by guijemont on #webkit). 7 8 Reverted changeset: 9 10 "run-javascriptcore-tests won't report test results for 11 testmasm, testair, testb3, testdfg and test api" 12 https://bugs.webkit.org/show_bug.cgi?id=199489 13 https://trac.webkit.org/changeset/247393 14 1 15 2019-07-12 Andy Estes <aestes@apple.com> 2 16 -
trunk/Tools/Scripts/run-javascriptcore-tests
r247393 r247428 93 93 my $failFast = 1; 94 94 my %jsonData = (); 95 my @testResults = ();96 my $isTestFailed = 0;97 95 my $remoteConfigFile; 98 96 my $jsonFileName; … … 401 399 print "$testName completed with rc=$testResult ($exitStatus)\n\n"; 402 400 403 my $testStatus = ($exitStatus == 0)? JSON::PP::true: JSON::PP::false;404 if ($testResult) {405 $isTestFailed = 1;406 push @testResults, $testName;407 }408 401 if (defined($jsonFileName)) { 402 my $testStatus = ($exitStatus == 0)? JSON::PP::true: JSON::PP::false; 409 403 $jsonData{$jsonTestStatusName} = $testStatus; 410 404 } 411 405 412 406 if ($testResult && $failFast) { 413 reportTestFailures();414 407 writeJsonDataIfApplicable(); 415 408 exit exitStatus($testResult); 416 409 } 417 }418 419 sub reportTestFailures {420 my $numJSCtestFailures = @testResults;421 if ($numJSCtestFailures) {422 print "\n** The following JSC test binaries failures have been introduced:\n";423 foreach my $testFailure (@testResults) {424 print "\t$testFailure\n";425 }426 }427 print "\n";428 429 print "Results for JSC test binaries:\n";430 printThingsFound($numJSCtestFailures, "failure", "failures", "found");431 print " OK.\n" if $numJSCtestFailures == 0;432 433 print "\n";434 410 } 435 411 … … 445 421 446 422 runJSCStressTests(); 447 reportTestFailures();448 449 if ($isTestFailed) {450 exit(1);451 }452 423 453 424 sub runJSCStressTests … … 603 574 604 575 if ($numJSCStressFailures) { 605 $isTestFailed = 1;606 576 print "\n** The following JSC stress test failures have been introduced:\n"; 607 577 foreach my $testFailure (@jscStressFailList) { … … 622 592 623 593 writeJsonDataIfApplicable(); 594 exit(1) if $numJSCStressFailures; 624 595 } 625 596
Note: See TracChangeset
for help on using the changeset viewer.