| 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 dest="show_results", | 183 dest="show_results", |
| 184 action="store_false", | 184 action="store_false", |
| 185 default=True, | 185 default=True, |
| 186 help="Don't launch a browser with results after the tests are do
ne"), | 186 help="Don't launch a browser with results after the tests are do
ne"), |
| 187 optparse.make_option( | 187 optparse.make_option( |
| 188 "-p", | 188 "-p", |
| 189 "--pixel", | 189 "--pixel", |
| 190 "--pixel-tests", | 190 "--pixel-tests", |
| 191 dest="pixel_tests", | 191 dest="pixel_tests", |
| 192 action="store_true", | 192 action="store_true", |
| 193 help="Enable pixel-to-pixel PNG comparisons"), | 193 default=True, |
| 194 help="Enable pixel-to-pixel PNG comparisons (enabled by default)
"), |
| 194 optparse.make_option( | 195 optparse.make_option( |
| 195 "--no-pixel", | 196 "--no-pixel", |
| 196 "--no-pixel-tests", | 197 "--no-pixel-tests", |
| 197 dest="pixel_tests", | 198 dest="pixel_tests", |
| 198 action="store_false", | 199 action="store_false", |
| 200 default=True, |
| 199 help="Disable pixel-to-pixel PNG comparisons"), | 201 help="Disable pixel-to-pixel PNG comparisons"), |
| 200 # FIXME: we should support a comma separated list with | 202 # FIXME: we should support a comma separated list with |
| 201 # --pixel-test-directory as well. | 203 # --pixel-test-directory as well. |
| 202 optparse.make_option( | 204 optparse.make_option( |
| 203 "--pixel-test-directory", | 205 "--pixel-test-directory", |
| 204 dest="pixel_test_directories", | 206 dest="pixel_test_directories", |
| 205 action="append", | 207 action="append", |
| 206 default=[], | 208 default=[], |
| 207 help=("A directory where it is allowed to execute tests as pixel
tests. Specify " | 209 help=("A directory where it is allowed to execute tests as pixel
tests. Specify " |
| 208 "multiple times to add multiple directories. This option i
mplies " | 210 "multiple times to add multiple directories. This option i
mplies " |
| (...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 if not options.child_processes: | 480 if not options.child_processes: |
| 479 options.child_processes = port.host.environ.get("WEBKIT_TEST_CHILD_PROCE
SSES", | 481 options.child_processes = port.host.environ.get("WEBKIT_TEST_CHILD_PROCE
SSES", |
| 480 str(port.default_child_p
rocesses())) | 482 str(port.default_child_p
rocesses())) |
| 481 if not options.max_locked_shards: | 483 if not options.max_locked_shards: |
| 482 options.max_locked_shards = int(port.host.environ.get("WEBKIT_TEST_MAX_L
OCKED_SHARDS", | 484 options.max_locked_shards = int(port.host.environ.get("WEBKIT_TEST_MAX_L
OCKED_SHARDS", |
| 483 str(port.default_m
ax_locked_shards()))) | 485 str(port.default_m
ax_locked_shards()))) |
| 484 | 486 |
| 485 if not options.configuration: | 487 if not options.configuration: |
| 486 options.configuration = port.default_configuration() | 488 options.configuration = port.default_configuration() |
| 487 | 489 |
| 488 if options.pixel_tests is None: | |
| 489 options.pixel_tests = port.default_pixel_tests() | |
| 490 | |
| 491 if not options.time_out_ms: | 490 if not options.time_out_ms: |
| 492 options.time_out_ms = str(port.default_timeout_ms()) | 491 options.time_out_ms = str(port.default_timeout_ms()) |
| 493 | 492 |
| 494 options.slow_time_out_ms = str(5 * int(options.time_out_ms)) | 493 options.slow_time_out_ms = str(5 * int(options.time_out_ms)) |
| 495 | 494 |
| 496 if options.additional_platform_directory: | 495 if options.additional_platform_directory: |
| 497 additional_platform_directories = [] | 496 additional_platform_directories = [] |
| 498 for path in options.additional_platform_directory: | 497 for path in options.additional_platform_directory: |
| 499 additional_platform_directories.append(port.host.filesystem.abspath(
path)) | 498 additional_platform_directories.append(port.host.filesystem.abspath(
path)) |
| 500 options.additional_platform_directory = additional_platform_directories | 499 options.additional_platform_directory = additional_platform_directories |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 _log.debug("\t%s", process) | 585 _log.debug("\t%s", process) |
| 587 | 586 |
| 588 return run_details | 587 return run_details |
| 589 | 588 |
| 590 finally: | 589 finally: |
| 591 printer.cleanup() | 590 printer.cleanup() |
| 592 | 591 |
| 593 if __name__ == '__main__': | 592 if __name__ == '__main__': |
| 594 exit_code = main(sys.argv[1:], sys.stdout, sys.stderr) | 593 exit_code = main(sys.argv[1:], sys.stdout, sys.stderr) |
| 595 sys.exit(exit_code) | 594 sys.exit(exit_code) |
| OLD | NEW |