OLD | NEW |
---|---|
1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged | 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged |
3 # Copyright (C) 2011 Apple Inc. All rights reserved. | 3 # Copyright (C) 2011 Apple Inc. All rights reserved. |
4 # | 4 # |
5 # Redistribution and use in source and binary forms, with or without | 5 # Redistribution and use in source and binary forms, with or without |
6 # modification, are permitted provided that the following conditions are | 6 # modification, are permitted provided that the following conditions are |
7 # met: | 7 # met: |
8 # | 8 # |
9 # * Redistributions of source code must retain the above copyright | 9 # * Redistributions of source code must retain the above copyright |
10 # notice, this list of conditions and the following disclaimer. | 10 # notice, this list of conditions and the following disclaimer. |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
70 return test_run_results.UNEXPECTED_ERROR_EXIT_STATUS | 70 return test_run_results.UNEXPECTED_ERROR_EXIT_STATUS |
71 | 71 |
72 try: | 72 try: |
73 run_details = run(port, options, args, stderr) | 73 run_details = run(port, options, args, stderr) |
74 if ((run_details.exit_code not in test_run_results.ERROR_CODES or | 74 if ((run_details.exit_code not in test_run_results.ERROR_CODES or |
75 run_details.exit_code == test_run_results.EARLY_EXIT_STATUS) and | 75 run_details.exit_code == test_run_results.EARLY_EXIT_STATUS) and |
76 not run_details.initial_results.keyboard_interrupted): | 76 not run_details.initial_results.keyboard_interrupted): |
77 bot_printer = buildbot_results.BuildBotPrinter(stdout, options.debug _rwt_logging) | 77 bot_printer = buildbot_results.BuildBotPrinter(stdout, options.debug _rwt_logging) |
78 bot_printer.print_results(run_details) | 78 bot_printer.print_results(run_details) |
79 | 79 |
80 if options.enable_versioned_results: | 80 if options.archive_results: |
81 gen_dash_board = GenerateDashBoard(port) | 81 gen_dash_board = GenerateDashBoard(port) |
vivekg
2014/08/20 14:14:05
nit: GenerateDashBoard can be renamed to more clas
| |
82 gen_dash_board.generate() | 82 gen_dash_board.generate() |
83 | 83 |
84 return run_details.exit_code | 84 return run_details.exit_code |
85 | 85 |
86 # We need to still handle KeyboardInterrupt, atleast for webkitpy unittest c ases. | 86 # We need to still handle KeyboardInterrupt, atleast for webkitpy unittest c ases. |
87 except KeyboardInterrupt: | 87 except KeyboardInterrupt: |
88 return test_run_results.INTERRUPTED_EXIT_STATUS | 88 return test_run_results.INTERRUPTED_EXIT_STATUS |
89 except test_run_results.TestRunException as e: | 89 except test_run_results.TestRunException as e: |
90 print >> stderr, e.msg | 90 print >> stderr, e.msg |
91 return e.code | 91 return e.code |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
164 help="Use the specified port's baselines first"), | 164 help="Use the specified port's baselines first"), |
165 optparse.make_option("--no-show-results", action="store_false", | 165 optparse.make_option("--no-show-results", action="store_false", |
166 default=True, dest="show_results", | 166 default=True, dest="show_results", |
167 help="Don't launch a browser with results after the tests " | 167 help="Don't launch a browser with results after the tests " |
168 "are done"), | 168 "are done"), |
169 optparse.make_option("--full-results-html", action="store_true", | 169 optparse.make_option("--full-results-html", action="store_true", |
170 default=False, | 170 default=False, |
171 help="Show all failures in results.html, rather than only regression s"), | 171 help="Show all failures in results.html, rather than only regression s"), |
172 optparse.make_option("--clobber-old-results", action="store_true", | 172 optparse.make_option("--clobber-old-results", action="store_true", |
173 default=False, help="Clobbers test results from previous runs."), | 173 default=False, help="Clobbers test results from previous runs."), |
174 optparse.make_option("--enable-versioned-results", action="store_true", | 174 optparse.make_option("--disable-results-archiving", dest='archive_result s', |
175 default=False, help="Archive the test results for later access."), | 175 action="store_false", default=True, |
176 help="Disable archiving of test results."), | |
Dirk Pranke
2014/08/20 16:15:19
Just get rid of the flag altogether, and make --cl
patro
2014/08/20 18:51:11
Done.
| |
176 optparse.make_option("--smoke", action="store_true", | 177 optparse.make_option("--smoke", action="store_true", |
177 help="Run just the SmokeTests"), | 178 help="Run just the SmokeTests"), |
178 optparse.make_option("--no-smoke", dest="smoke", action="store_false", | 179 optparse.make_option("--no-smoke", dest="smoke", action="store_false", |
179 help="Do not run just the SmokeTests"), | 180 help="Do not run just the SmokeTests"), |
180 ])) | 181 ])) |
181 | 182 |
182 option_group_definitions.append(("Testing Options", [ | 183 option_group_definitions.append(("Testing Options", [ |
183 optparse.make_option("--build", dest="build", | 184 optparse.make_option("--build", dest="build", |
184 action="store_true", default=True, | 185 action="store_true", default=True, |
185 help="Check to ensure the build is up-to-date (default)."), | 186 help="Check to ensure the build is up-to-date (default)."), |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
381 printer.print_config(port.results_directory()) | 382 printer.print_config(port.results_directory()) |
382 | 383 |
383 run_details = manager.run(args) | 384 run_details = manager.run(args) |
384 _log.debug("Testing completed, Exit status: %d" % run_details.exit_code) | 385 _log.debug("Testing completed, Exit status: %d" % run_details.exit_code) |
385 return run_details | 386 return run_details |
386 finally: | 387 finally: |
387 printer.cleanup() | 388 printer.cleanup() |
388 | 389 |
389 if __name__ == '__main__': | 390 if __name__ == '__main__': |
390 sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr)) | 391 sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr)) |
OLD | NEW |