| 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 13 matching lines...) Expand all Loading... |
| 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 24 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 | 28 |
| 29 """Package that handles non-debug, non-file output for run-webkit-tests.""" | 29 """Package that handles non-debug, non-file output for run-webkit-tests.""" |
| 30 | 30 |
| 31 import math | 31 import math |
| 32 import optparse | 32 import optparse |
| 33 | 33 |
| 34 from webkitpy.layout_tests.models import test_expectations |
| 35 from webkitpy.layout_tests.views.metered_stream import MeteredStream |
| 34 from webkitpy.tool import grammar | 36 from webkitpy.tool import grammar |
| 35 from webkitpy.layout_tests.models import test_expectations | |
| 36 from webkitpy.layout_tests.models.test_expectations import TestExpectationParser | |
| 37 from webkitpy.layout_tests.models.test_expectations import TestExpectations | |
| 38 from webkitpy.layout_tests.views.metered_stream import MeteredStream | |
| 39 | 37 |
| 40 | 38 |
| 41 NUM_SLOW_TESTS_TO_LOG = 10 | 39 NUM_SLOW_TESTS_TO_LOG = 10 |
| 42 | 40 |
| 43 | 41 |
| 44 def print_options(): | 42 def print_options(): |
| 45 return [ | 43 return [ |
| 46 optparse.make_option('--debug-rwt-logging', action='store_true', default
=False, | 44 optparse.make_option('--debug-rwt-logging', action='store_true', default
=False, |
| 47 help='print timestamps and debug information for ru
n-webkit-tests itself'), | 45 help='print timestamps and debug information for ru
n-webkit-tests itself'), |
| 48 optparse.make_option('--details', action='store_true', default=False, | 46 optparse.make_option('--details', action='store_true', default=False, |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 435 self._meter.write_throttled_update(msg) | 433 self._meter.write_throttled_update(msg) |
| 436 | 434 |
| 437 def write_update(self, msg): | 435 def write_update(self, msg): |
| 438 self._meter.write_update(msg) | 436 self._meter.write_update(msg) |
| 439 | 437 |
| 440 def writeln(self, msg): | 438 def writeln(self, msg): |
| 441 self._meter.writeln(msg) | 439 self._meter.writeln(msg) |
| 442 | 440 |
| 443 def flush(self): | 441 def flush(self): |
| 444 self._meter.flush() | 442 self._meter.flush() |
| OLD | NEW |