| 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 | 92 |
| 93 option_group_definitions.append( | 93 option_group_definitions.append( |
| 94 ("Printing Options", printing.print_options())) | 94 ("Printing Options", printing.print_options())) |
| 95 | 95 |
| 96 option_group_definitions.append( | 96 option_group_definitions.append( |
| 97 ("Android-specific Options", [ | 97 ("Android-specific Options", [ |
| 98 optparse.make_option( | 98 optparse.make_option( |
| 99 "--adb-device", | 99 "--adb-device", |
| 100 action="append", | 100 action="append", |
| 101 default=[], | 101 default=[], |
| 102 dest='adb_devices', |
| 102 help="Run Android layout tests on these devices."), | 103 help="Run Android layout tests on these devices."), |
| 103 # FIXME: Flip this to be off by default once we can log the | 104 # FIXME: Flip this to be off by default once we can log the |
| 104 # device setup more cleanly. | 105 # device setup more cleanly. |
| 105 optparse.make_option( | 106 optparse.make_option( |
| 106 "--no-android-logging", | 107 "--no-android-logging", |
| 107 dest="android_logging", | 108 dest="android_logging", |
| 108 action="store_false", | 109 action="store_false", |
| 109 default=True, | 110 default=True, |
| 110 help=("Do not log android-specific debug messages (default is to
log as part " | 111 help=("Do not log android-specific debug messages (default is to
log as part " |
| 111 "of --debug-rwt-logging")), | 112 "of --debug-rwt-logging")), |
| (...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 _log.debug("\t%s" % process) | 577 _log.debug("\t%s" % process) |
| 577 | 578 |
| 578 return run_details | 579 return run_details |
| 579 | 580 |
| 580 finally: | 581 finally: |
| 581 printer.cleanup() | 582 printer.cleanup() |
| 582 | 583 |
| 583 if __name__ == '__main__': | 584 if __name__ == '__main__': |
| 584 exit_code = main(sys.argv[1:], sys.stdout, sys.stderr) | 585 exit_code = main(sys.argv[1:], sys.stdout, sys.stderr) |
| 585 sys.exit(exit_code) | 586 sys.exit(exit_code) |
| OLD | NEW |