Chromium Code Reviews| Index: tools/testing/dart/test_runner.dart |
| diff --git a/tools/testing/dart/test_runner.dart b/tools/testing/dart/test_runner.dart |
| index 370022f073c0a9601b26b2a025dd5793a9df1aa5..3db97e59ecf58ee6f963e18c9208c16d6a3db912 100644 |
| --- a/tools/testing/dart/test_runner.dart |
| +++ b/tools/testing/dart/test_runner.dart |
| @@ -151,21 +151,22 @@ class TestOutput { |
| bool get hasTimedOut() => timedOut; |
| bool get didFail() { |
| - if (exitCode != 0 && !hasCrashed) return true; |
| + if (testCase is !BrowserTestCase) return (exitCode != 0 && !hasCrashed); |
| + // Browser case: |
| // Browser tests fail unless stdout contains |
| // 'Content-Type: text/plain\nPASS'. |
| - if (testCase is !BrowserTestCase) return false; |
| String previous_line = ''; |
| for (String line in stdout) { |
| if (line == 'PASS' && previous_line == 'Content-Type: text/plain') { |
| - return false; |
| + return (exitCode != 0 && !hasCrashed); |
| } |
| // If the browser test failed, it may have been because DumpRenderTree |
| - // and the virtual framebuffer X server didn't hook up. So return false |
| - // if we get the X server error. Issue dart:1135 is filed. |
| + // and the virtual framebuffer X server didn't hook up. |
| if (line.contains('Gtk-WARNING **: cannot open display: :99')) { |
|
Siggi Cherem (dart-lang)
2012/01/11 20:55:15
I just saw the failure here:
http://chromegw.corp.
|
| - return false; |
| + // If we get the X server error, return the expected value |
| + // We cannot restart the test from here. Issue dart:1135 is filed. |
| + return testCase.isNegative; |
|
Siggi Cherem (dart-lang)
2012/01/11 18:40:15
could we print a warning to stdout too?
|
| } |
| previous_line = line; |
| } |