OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # | 2 # |
3 # Copyright 2012 the V8 project authors. All rights reserved. | 3 # Copyright 2012 the V8 project authors. All rights reserved. |
4 # Redistribution and use in source and binary forms, with or without | 4 # Redistribution and use in source and binary forms, with or without |
5 # modification, are permitted provided that the following conditions are | 5 # modification, are permitted provided that the following conditions are |
6 # met: | 6 # met: |
7 # | 7 # |
8 # * Redistributions of source code must retain the above copyright | 8 # * Redistributions of source code must retain the above copyright |
9 # notice, this list of conditions and the following disclaimer. | 9 # notice, this list of conditions and the following disclaimer. |
10 # * Redistributions in binary form must reproduce the above | 10 # * Redistributions in binary form must reproduce the above |
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
607 test_id += 1 | 607 test_id += 1 |
608 | 608 |
609 if options.cat: | 609 if options.cat: |
610 return 0 # We're done here. | 610 return 0 # We're done here. |
611 | 611 |
612 if options.report: | 612 if options.report: |
613 verbose.PrintReport(all_tests) | 613 verbose.PrintReport(all_tests) |
614 | 614 |
615 # Run the tests, either locally or distributed on the network. | 615 # Run the tests, either locally or distributed on the network. |
616 start_time = time.time() | 616 start_time = time.time() |
617 progress_indicator = progress.PROGRESS_INDICATORS[options.progress]() | 617 progress_indicator = progress.IndicatorNotifier() |
| 618 progress_indicator.register(progress.PROGRESS_INDICATORS[options.progress]()) |
618 if options.junitout: | 619 if options.junitout: |
619 progress_indicator = progress.JUnitTestProgressIndicator( | 620 progress_indicator.register(progress.JUnitTestProgressIndicator( |
620 progress_indicator, options.junitout, options.junittestsuite) | 621 options.junitout, options.junittestsuite)) |
621 if options.json_test_results: | 622 if options.json_test_results: |
622 progress_indicator = progress.JsonTestProgressIndicator( | 623 progress_indicator.register(progress.JsonTestProgressIndicator( |
623 progress_indicator, options.json_test_results, arch, | 624 options.json_test_results, arch, MODES[mode]["execution_mode"])) |
624 MODES[mode]["execution_mode"]) | |
625 | 625 |
626 run_networked = not options.no_network | 626 run_networked = not options.no_network |
627 if not run_networked: | 627 if not run_networked: |
628 print("Network distribution disabled, running tests locally.") | 628 print("Network distribution disabled, running tests locally.") |
629 elif utils.GuessOS() != "linux": | 629 elif utils.GuessOS() != "linux": |
630 print("Network distribution is only supported on Linux, sorry!") | 630 print("Network distribution is only supported on Linux, sorry!") |
631 run_networked = False | 631 run_networked = False |
632 peers = [] | 632 peers = [] |
633 if run_networked: | 633 if run_networked: |
634 peers = network_execution.GetPeers() | 634 peers = network_execution.GetPeers() |
(...skipping 16 matching lines...) Expand all Loading... |
651 exit_code = runner.Run(options.j) | 651 exit_code = runner.Run(options.j) |
652 overall_duration = time.time() - start_time | 652 overall_duration = time.time() - start_time |
653 | 653 |
654 if options.time: | 654 if options.time: |
655 verbose.PrintTestDurations(suites, overall_duration) | 655 verbose.PrintTestDurations(suites, overall_duration) |
656 return exit_code | 656 return exit_code |
657 | 657 |
658 | 658 |
659 if __name__ == "__main__": | 659 if __name__ == "__main__": |
660 sys.exit(Main()) | 660 sys.exit(Main()) |
OLD | NEW |