| 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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 274 default=False, help=("Makes sure the test files parse for all " | 274 default=False, help=("Makes sure the test files parse for all " |
| 275 "configurations. Does not run any tests.")), | 275 "configurations. Does not run any tests.")), |
| 276 ])) | 276 ])) |
| 277 | 277 |
| 278 # FIXME: Move these into json_results_generator.py | 278 # FIXME: Move these into json_results_generator.py |
| 279 option_group_definitions.append(("Result JSON Options", [ | 279 option_group_definitions.append(("Result JSON Options", [ |
| 280 optparse.make_option("--master-name", help="The name of the buildbot mas
ter."), | 280 optparse.make_option("--master-name", help="The name of the buildbot mas
ter."), |
| 281 optparse.make_option("--builder-name", default="", | 281 optparse.make_option("--builder-name", default="", |
| 282 help=("The name of the builder shown on the waterfall running " | 282 help=("The name of the builder shown on the waterfall running " |
| 283 "this script e.g. WebKit.")), | 283 "this script e.g. WebKit.")), |
| 284 optparse.make_option("--build-name", default="DUMMY_BUILD_NAME", | |
| 285 help=("The name of the builder used in its path, e.g. " | |
| 286 "webkit-rel.")), | |
| 287 optparse.make_option("--build-number", default="DUMMY_BUILD_NUMBER", | 284 optparse.make_option("--build-number", default="DUMMY_BUILD_NUMBER", |
| 288 help=("The build number of the builder running this script.")), | 285 help=("The build number of the builder running this script.")), |
| 289 optparse.make_option("--test-results-server", default="", | 286 optparse.make_option("--test-results-server", default="", |
| 290 help=("If specified, upload results json files to this appengine " | 287 help=("If specified, upload results json files to this appengine " |
| 291 "server.")), | 288 "server.")), |
| 292 optparse.make_option("--write-full-results-to", | 289 optparse.make_option("--write-full-results-to", |
| 293 help=("If specified, copy full_results.json from the results dir " | 290 help=("If specified, copy full_results.json from the results dir " |
| 294 "to the specified path.")), | 291 "to the specified path.")), |
| 295 ])) | 292 ])) |
| 296 | 293 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 printer.print_config(port.results_directory()) | 379 printer.print_config(port.results_directory()) |
| 383 | 380 |
| 384 run_details = manager.run(args) | 381 run_details = manager.run(args) |
| 385 _log.debug("Testing completed, Exit status: %d" % run_details.exit_code) | 382 _log.debug("Testing completed, Exit status: %d" % run_details.exit_code) |
| 386 return run_details | 383 return run_details |
| 387 finally: | 384 finally: |
| 388 printer.cleanup() | 385 printer.cleanup() |
| 389 | 386 |
| 390 if __name__ == '__main__': | 387 if __name__ == '__main__': |
| 391 sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr)) | 388 sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr)) |
| OLD | NEW |