| Index: tools/testing/dart/test_suite.dart
|
| diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
|
| index 1c6e185c058384cd49af7b0c895a8db9e8205e92..b6cd021b92eb89c9c78dd40a6698adfbc108bc22 100644
|
| --- a/tools/testing/dart/test_suite.dart
|
| +++ b/tools/testing/dart/test_suite.dart
|
| @@ -1113,7 +1113,7 @@ class StandardTestSuite extends TestSuite {
|
| contentShellFilename, fullHtmlPath, contentShellOptions,
|
| dartFlags, configurationDir));
|
| } else {
|
| - // Use the BrowserController to send the test to a browser process.
|
| + assert(configuration['use_browser_controller']);
|
| // This command is not actually run, it is used for reproducing
|
| // the failure.
|
| args = ['tools/testing/dart/launch_browser.dart',
|
| @@ -1996,6 +1996,8 @@ class SummaryReport {
|
| static int compileErrorSkip = 0;
|
|
|
| static void add(Set<Expectation> expectations) {
|
| + bool containsFail = expectations.any(
|
| + (expectation) => expectation.canBeOutcomeOf(Expectation.FAIL));
|
| ++total;
|
| if (expectations.contains(Expectation.SKIP)) {
|
| ++skipped;
|
| @@ -2003,8 +2005,9 @@ class SummaryReport {
|
| ++skipped;
|
| ++skippedByDesign;
|
| } else {
|
| + // Counts the number of flaky tests.
|
| if (expectations.contains(Expectation.PASS) &&
|
| - expectations.contains(Expectation.FAIL) &&
|
| + containsFail &&
|
| !expectations.contains(Expectation.CRASH) &&
|
| !expectations.contains(Expectation.OK)) {
|
| ++noCrash;
|
| @@ -2016,7 +2019,7 @@ class SummaryReport {
|
| expectations.length == 2) {
|
| ++failOk;
|
| }
|
| - if (expectations.contains(Expectation.FAIL) && expectations.length == 1) {
|
| + if (containsFail && expectations.length == 1) {
|
| ++fail;
|
| }
|
| if (expectations.contains(Expectation.CRASH) &&
|
|
|