OLD | NEW |
1 # Copyright (C) 2010, 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2010, 2012 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 24 matching lines...) Expand all Loading... |
35 from webkitpy.layout_tests.models import test_expectations | 35 from webkitpy.layout_tests.models import test_expectations |
36 from webkitpy.layout_tests.models.test_expectations import TestExpectations, Tes
tExpectationParser | 36 from webkitpy.layout_tests.models.test_expectations import TestExpectations, Tes
tExpectationParser |
37 from webkitpy.layout_tests.views.metered_stream import MeteredStream | 37 from webkitpy.layout_tests.views.metered_stream import MeteredStream |
38 | 38 |
39 | 39 |
40 NUM_SLOW_TESTS_TO_LOG = 10 | 40 NUM_SLOW_TESTS_TO_LOG = 10 |
41 | 41 |
42 | 42 |
43 def print_options(): | 43 def print_options(): |
44 return [ | 44 return [ |
| 45 optparse.make_option('--debug-rwt-logging', action='store_true', default
=False, |
| 46 help='print timestamps and debug information for ru
n-webkit-tests itself'), |
| 47 optparse.make_option('--details', action='store_true', default=False, |
| 48 help='print detailed results for every test'), |
45 optparse.make_option('-q', '--quiet', action='store_true', default=False
, | 49 optparse.make_option('-q', '--quiet', action='store_true', default=False
, |
46 help='run quietly (errors, warnings, and progress o
nly)'), | 50 help='run quietly (errors, warnings, and progress o
nly)'), |
47 optparse.make_option('--timing', action='store_true', default=False, | 51 optparse.make_option('--timing', action='store_true', default=False, |
48 help='display test times (summary plus per-test w/
--verbose)'), | 52 help='display test times (summary plus per-test w/
--verbose)'), |
49 optparse.make_option('-v', '--verbose', action='store_true', default=Fal
se, | 53 optparse.make_option('-v', '--verbose', action='store_true', default=Fal
se, |
50 help='print a summarized result for every test (one
line per test)'), | 54 help='print a summarized result for every test (one
line per test)'), |
51 optparse.make_option('--details', action='store_true', default=False, | |
52 help='print detailed results for every test'), | |
53 optparse.make_option('--debug-rwt-logging', action='store_true', default
=False, | |
54 help='print timestamps and debug information for ru
n-webkit-tests itself'), | |
55 ] | 55 ] |
56 | 56 |
57 | 57 |
58 class Printer(object): | 58 class Printer(object): |
59 """Class handling all non-debug-logging printing done by run-webkit-tests.""
" | 59 """Class handling all non-debug-logging printing done by run-webkit-tests.""
" |
60 | 60 |
61 def __init__(self, port, options, regular_output, logger=None): | 61 def __init__(self, port, options, regular_output, logger=None): |
62 self.num_completed = 0 | 62 self.num_completed = 0 |
63 self.num_tests = 0 | 63 self.num_tests = 0 |
64 self._port = port | 64 self._port = port |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 self._meter.write_throttled_update(msg) | 424 self._meter.write_throttled_update(msg) |
425 | 425 |
426 def write_update(self, msg): | 426 def write_update(self, msg): |
427 self._meter.write_update(msg) | 427 self._meter.write_update(msg) |
428 | 428 |
429 def writeln(self, msg): | 429 def writeln(self, msg): |
430 self._meter.writeln(msg) | 430 self._meter.writeln(msg) |
431 | 431 |
432 def flush(self): | 432 def flush(self): |
433 self._meter.flush() | 433 self._meter.flush() |
OLD | NEW |