Fix SummaryReport after introduction of the RuntimeError,CompileTimeError,... markers

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 1095 matching lines @@
               dartFlags.add('--enable_asserts');
               dartFlags.add("--enable_type_checks");
             }
             dartFlags.addAll(vmOptions);
           }
 
           commandSet.add(CommandBuilder.instance.getContentShellCommand(
               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',
                   runtime,
                   fullHtmlPath];
           commandSet.add(CommandBuilder.instance.getBrowserTestCommand(
               runtime, fullHtmlPath, TestUtils.dartTestExecutable.toString(),
               args, configurationDir, checkedMode: configuration['checked']));
         }
 
@@ skipping 862 matching lines @@
   static int skippedByDesign = 0;
   static int noCrash = 0;
   static int pass = 0;
   static int failOk = 0;
   static int fail = 0;
   static int crash = 0;
   static int timeout = 0;
   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;
     } else if (expectations.contains(Expectation.SKIP_BY_DESIGN)) {
       ++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;
       }
       if (expectations.contains(Expectation.PASS) && expectations.length == 1) {
         ++pass;
       }
       if (expectations.containsAll([Expectation.FAIL, Expectation.OK]) &&
           expectations.length == 2) {
         ++failOk;
       }
-      if (expectations.contains(Expectation.FAIL) && expectations.length == 1) {
+      if (containsFail && expectations.length == 1) {
         ++fail;
       }
       if (expectations.contains(Expectation.CRASH) &&
           expectations.length == 1) {
         ++crash;
       }
       if (expectations.contains(Expectation.TIMEOUT)) {
         ++timeout;
       }
     }
@@ skipping 12 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }