Fixes for the test framework multitests.

tools/testing/dart/multitest.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.
 
 library multitest;
 
 import "dart:async";
 import "dart:io";
 import "test_suite.dart";
 import "utils.dart";
@@ skipping 161 matching lines @@
   }
 }
 
 // Find all relative imports and copy them into the dir that contains
 // the generated tests.
 Set<String> _findAllRelativeImports(Path topLibrary) {
   Set<Path> toSearch = new Set<Path>.from([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>();
     for (Path filename in thisPass) {
       File f = new File(filename.toNativePath());
       for (String line in f.readAsLinesSync()) {
         Match match = relativeImportRegExp.firstMatch(line);
         if (match != null) {
           Path relativePath = new Path(match.group(3));
           if (foundImports.contains(relativePath.toString())) {
@@ skipping 96 matching lines @@
     // TestSuite.forDirectory.
     split.removeLast();
   }
   String path = '${generatedTestDir.path}/${split.last}';
   Directory dir = new Directory(path);
   if (!dir.existsSync()) {
     dir.createSync();
   }
   return new Path(new File(path).absolute.path);
 }