| OLD | NEW |
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 fail_text += "Command: %s" % EscapeCommand(self.runner.GetCommand(test)) | 285 fail_text += "Command: %s" % EscapeCommand(self.runner.GetCommand(test)) |
| 286 if test.output.HasCrashed(): | 286 if test.output.HasCrashed(): |
| 287 fail_text += "exit code: %d\n--- CRASHED ---" % test.output.exit_code | 287 fail_text += "exit code: %d\n--- CRASHED ---" % test.output.exit_code |
| 288 if test.output.HasTimedOut(): | 288 if test.output.HasTimedOut(): |
| 289 fail_text += "--- TIMEOUT ---" | 289 fail_text += "--- TIMEOUT ---" |
| 290 self.outputter.HasRunTest( | 290 self.outputter.HasRunTest( |
| 291 [test.GetLabel()] + self.runner.context.mode_flags + test.flags, | 291 [test.GetLabel()] + self.runner.context.mode_flags + test.flags, |
| 292 test.duration, | 292 test.duration, |
| 293 fail_text) | 293 fail_text) |
| 294 | 294 |
| 295 def Heartbeat(self): |
| 296 self.progress_indicator.Heartbeat() |
| 295 | 297 |
| 296 class JsonTestProgressIndicator(ProgressIndicator): | 298 class JsonTestProgressIndicator(ProgressIndicator): |
| 297 | 299 |
| 298 def __init__(self, progress_indicator, json_test_results, arch, mode): | 300 def __init__(self, progress_indicator, json_test_results, arch, mode): |
| 299 self.progress_indicator = progress_indicator | 301 self.progress_indicator = progress_indicator |
| 300 self.json_test_results = json_test_results | 302 self.json_test_results = json_test_results |
| 301 self.arch = arch | 303 self.arch = arch |
| 302 self.mode = mode | 304 self.mode = mode |
| 303 self.results = [] | 305 self.results = [] |
| 304 self.tests = [] | 306 self.tests = [] |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 ABS_PATH_PREFIX, ""), | 359 ABS_PATH_PREFIX, ""), |
| 358 "run": test.run, | 360 "run": test.run, |
| 359 "stdout": test.output.stdout, | 361 "stdout": test.output.stdout, |
| 360 "stderr": test.output.stderr, | 362 "stderr": test.output.stderr, |
| 361 "exit_code": test.output.exit_code, | 363 "exit_code": test.output.exit_code, |
| 362 "result": test.suite.GetOutcome(test), | 364 "result": test.suite.GetOutcome(test), |
| 363 "expected": list(test.outcomes or ["PASS"]), | 365 "expected": list(test.outcomes or ["PASS"]), |
| 364 "duration": test.duration, | 366 "duration": test.duration, |
| 365 }) | 367 }) |
| 366 | 368 |
| 369 def Heartbeat(self): |
| 370 self.progress_indicator.Heartbeat() |
| 371 |
| 367 | 372 |
| 368 PROGRESS_INDICATORS = { | 373 PROGRESS_INDICATORS = { |
| 369 'verbose': VerboseProgressIndicator, | 374 'verbose': VerboseProgressIndicator, |
| 370 'dots': DotsProgressIndicator, | 375 'dots': DotsProgressIndicator, |
| 371 'color': ColorProgressIndicator, | 376 'color': ColorProgressIndicator, |
| 372 'mono': MonochromeProgressIndicator | 377 'mono': MonochromeProgressIndicator |
| 373 } | 378 } |
| OLD | NEW |