Merge libv1.

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 389 matching lines @@
     }
     int shards = configuration['shards'];
     if (shards > 1) {
       int shard = configuration['shard'];
       if (testName.hashCode % shards != shard - 1) {
         return;
       }
     }
 
     Set<String> expectations = testExpectations.expectations(testName);
+    if (info.hasCompileError &&
+        TestUtils.isBrowserRuntime(configuration['runtime'])) {
+      SummaryReport.addCompileErrorSkipTest();
+      return;
+    }
     if (configuration['report']) {
       // Tests with multiple VMOptions are counted more than once.
       for (var dummy in getVmOptions(optionsFromFile)) {
         SummaryReport.add(expectations);
       }
     }
     if (expectations.contains(SKIP)) return;
 
     if (configuration['compiler'] != 'none' && info.hasCompileError) {
       // If a compile-time error is expected, and we're testing a
@@ skipping 1019 matching lines @@
 
 class SummaryReport {
   static int total = 0;
   static int skipped = 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<String> expectations) {
     ++total;
     if (expectations.contains(SKIP)) {
       ++skipped;
     } else {
       if (expectations.contains(PASS) && expectations.contains(FAIL) &&
           !expectations.contains(CRASH) && !expectations.contains(OK)) {
         ++noCrash;
       }
       if (expectations.contains(PASS) && expectations.length == 1) {
         ++pass;
       }
       if (expectations.containsAll([FAIL, OK]) && expectations.length == 2) {
         ++failOk;
       }
       if (expectations.contains(FAIL) && expectations.length == 1) {
         ++fail;
       }
       if (expectations.contains(CRASH) && expectations.length == 1) {
         ++crash;
       }
       if (expectations.contains(TIMEOUT)) {
         ++timeout;
       }
     }
   }
 
+  static void addCompileErrorSkipTest() {
+    total++;
+    compileErrorSkip++;
+  }
+
   static void printReport() {
     if (total == 0) return;
     String report = """Total: $total tests
  * $skipped tests will be skipped
  * $noCrash tests are expected to be flaky but not crash
  * $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);
    }
 }