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

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

Issue 164333013: Fixes for the test framework multitests. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Change regexp to multiline regexp. Created 6 years, 10 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 | « no previous file | tools/testing/dart/test_suite.dart » ('j') | tools/testing/dart/test_suite.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/dart/multitest.dart
diff --git a/tools/testing/dart/multitest.dart b/tools/testing/dart/multitest.dart
index 3c9c535dfd73e39f72b115ae8240f4d83c9c600b..4116780d9c4293289da45885bc5afe33b5763aea 100644
--- a/tools/testing/dart/multitest.dart
+++ b/tools/testing/dart/multitest.dart
@@ -179,7 +179,12 @@ Set<String> _findAllRelativeImports(Path topLibrary) {
Set<String> foundImports = new Set<String>();
Path libraryDir = topLibrary.directoryPath;
RegExp relativeImportRegExp = new RegExp(
- '^(import|part)\\s+["\'](?!(dart:|dart-ext:|package:|/))([^"\']*)["\']');
+ '^(?:@.*\\s+)?' // Allow for a meta-data annotation.
+ '(import|part)'
+ '\\s+["\']'
+ '(?!(dart:|dart-ext:|package:|/))' // Look-ahead: not in package.
+ '([^"\']*)' // The path to the imported file.
+ '["\']');
while (!toSearch.isEmpty) {
var thisPass = toSearch;
toSearch = new Set<Path>();
« no previous file with comments | « no previous file | tools/testing/dart/test_suite.dart » ('j') | tools/testing/dart/test_suite.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698