Index: tools/testing/dart/test_suite.dart |
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart |
index a7d5e9ac1c3f19202f2605ceedd26f28ef172588..e5f33ea2685468acf4e28cf95c369b510fb244b9 100644 |
--- a/tools/testing/dart/test_suite.dart |
+++ b/tools/testing/dart/test_suite.dart |
@@ -627,6 +627,8 @@ class StandardTestSuite extends TestSuite { |
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; |
@@ -833,10 +835,8 @@ class StandardTestSuite extends TestSuite { |
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']; |
@@ -1310,7 +1310,7 @@ class StandardTestSuite extends TestSuite { |
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); |