Revert "Removed the 'we don't run multitests on browsers'-hack"

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 609 matching lines @@
     var isNegative = info.hasCompileError;
     if (info.hasRuntimeError && hasRuntime) {
       isNegative = true;
     }
 
     // Look up expectations in status files using a test name generated
     // from the test file's path.
     String testName;
 
     if (optionsFromFile['isMultitest']) {
+      // Multitests do not run on browsers.
+      if (TestUtils.isBrowserRuntime(configuration['runtime'])) return;
       // Multitests are in [build directory]/generated_tests/... .
       // The test name will be '[test filename (no extension)]/[multitest key].
       String name = filePath.filenameWithoutExtension;
       int middle = name.lastIndexOf('_');
       testName = '${name.substring(0, middle)}/${name.substring(middle + 1)}';
     } else {
       // The test name is the relative path from the test suite directory to
       // the test, with the .dart extension removed.
       Expect.isTrue(filePath.toNativePath().startsWith(
                     suiteDir.toNativePath()));
@@ skipping 186 matching lines @@
                           Object expectations,
                           bool isWrappingRequired) {
     // TODO(kustermann/ricow): This method should be refactored.
     Map optionsFromFile = info.optionsFromFile;
     Path filePath = info.filePath;
     String filename = filePath.toString();
     bool isWebTest = optionsFromFile['containsDomImport'];
     bool isLibraryDefinition = optionsFromFile['isLibraryDefinition'];
     if (isWrappingRequired
         && !isLibraryDefinition && optionsFromFile['containsSourceOrImport']) {
-      print('Warning for $filename: Browser tests require "library" '
-            'in any file that uses "import" or "source". '
-            'Please mark this test as failing in the status file. '
-            '(see http://dartbug.com/2264)');
+      print('Warning for $filename: Browser tests require #library '
+            'in any file that uses #import, #source, or #resource');
     }
 
     final String compiler = configuration['compiler'];
     final String runtime = configuration['runtime'];
 
     for (var vmOptions in getVmOptions(optionsFromFile)) {
       // Create a unique temporary directory for each set of vmOptions.
       // TODO(dart:429): Replace separate replaceAlls with a RegExp when
       // replaceAll(RegExp, String) is implemented.
       String optionsName = '';
@@ skipping 453 matching lines @@
         new RegExp(r"/// ([0-9][0-9]:){0,1}\s*compile-time error");
     RegExp staticCleanRegExp = new RegExp(r"// @static-clean");
     RegExp leadingHashRegExp = new RegExp(r"^#", multiLine: true);
     RegExp isolateStubsRegExp = new RegExp(r"// IsolateStubs=(.*)");
     // TODO(gram) Clean these up once the old directives are not supported.
     RegExp domImportRegExp =
         new RegExp(r"^[#]?import.*dart:html", multiLine: true);
     RegExp libraryDefinitionRegExp =
         new RegExp(r"^[#]?library[\( ]", multiLine: true);
     RegExp sourceOrImportRegExp =
-        new RegExp("^(#?source|#?import|part)[ \t]+[\('\"]", multiLine: true);
+        new RegExp("^(#source|#import|part)[ \t]+[\('\"]", multiLine: true);
 
     var bytes = new File.fromPath(filePath).readAsBytesSync();
     String contents = decodeUtf8(bytes);
     bytes = null;
 
     // Find the options in the file.
     List<List> result = new List<List>();
     List<String> dartOptions;
     String packageRoot;
     bool hasCompileError = contents.contains("@compile-error");
@@ skipping 509 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);
    }
 }