Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1130)

Unified Diff: tools/testing/dart/test_suite.dart

Issue 11886064: Removed the 'we don't run multitests on browsers'-hack (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/language/language.status ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index ff466f686ec3280d4c722271a6a75d894825a5c3..893782e9bfced583f84dc701475584fda8860a46 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -627,8 +627,6 @@ 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;
@@ -835,8 +833,10 @@ 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, #source, or #resource');
+ 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)');
}
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);
« no previous file with comments | « tests/language/language.status ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698