Improve how we handle packages/ HTML imports. This resolves better any valid

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 808 matching lines @@
     if (optionsFromFile['isMultitest']) {
       group.add(doMultitest(filePath, buildDir, suiteDir, createTestCase));
     } else {
       createTestCase(filePath,
                      optionsFromFile['hasCompileError'],
                      optionsFromFile['hasRuntimeError'],
                      hasStaticWarning: optionsFromFile['hasStaticWarning']);
     }
   }
 
+  static Path _findPubspecYamlFile(Path filePath) {

[Siggi Cherem (dart-lang), 2014/01/29 22:15:08]

no changes here, I just extracted it and made it private

+    final existsCache = TestUtils.existsCache;
+
+    Path root = TestUtils.dartDir();
+    assert ("$filePath".startsWith("$root"));
+
+    // We start with the parent directory of [filePath] and go up until
+    // the root directory (excluding the root).
+    List<String> segments =
+        filePath.directoryPath.relativeTo(root).segments();
+    while (segments.length > 0) {
+      var pubspecYamlPath =
+          new Path(segments.join('/')).append('pubspec.yaml');
+      if (existsCache.doesFileExist(pubspecYamlPath.toNativePath())) {
+        return root.join(pubspecYamlPath);
+      }
+      segments.removeLast();
+    }
+    return null;
+  }
+
   void enqueueTestCaseFromTestInformation(TestInformation info) {
     var filePath = info.filePath;
     var optionsFromFile = info.optionsFromFile;
 
-    Path findPubspecYamlFile(Path filePath) {
-      final existsCache = TestUtils.existsCache;
-
-      Path root = TestUtils.dartDir();
-      assert ("$filePath".startsWith("$root"));
-
-      // We start with the parent directory of [filePath] and go up until
-      // the root directory (excluding the root).
-      List<String> segments =
-          filePath.directoryPath.relativeTo(root).segments();
-      while (segments.length > 0) {
-        var pubspecYamlPath =
-            new Path(segments.join('/')).append('pubspec.yaml');
-        if (existsCache.doesFileExist(pubspecYamlPath.toNativePath())) {
-          return root.join(pubspecYamlPath);
-        }
-        segments.removeLast();
-      }
-      return null;
-    }
-
     Map buildSpecialPackageRoot(Path pubspecYamlFile) {
       var commands = <Command>[];
       var packageDir = pubspecYamlFile.directoryPath;
       var packageName = packageDir.filename;
 
       var checkoutDirectory =
           createPubspecCheckoutDirectory(packageDir);
       var modifiedYamlFile = new Path(checkoutDirectory).append("pubspec.yaml");
       var pubCacheDirectory = new Path(checkoutDirectory).append("pub-cache");
       var newPackageRoot = new Path(checkoutDirectory).append("packages");
@@ skipping 44 matching lines @@
         'package-root' : newPackageRoot,
       };
     }
 
     // If this test is inside a package, we will check if there is a
     // pubspec.yaml file and if so, create a custom package root for it.
     List<Command> baseCommands = <Command>[];
     Path packageRoot;
     if (configuration['use_repository_packages'] ||
         configuration['use_public_packages']) {
-        Path pubspecYamlFile = findPubspecYamlFile(filePath);
+        Path pubspecYamlFile = _findPubspecYamlFile(filePath);
         if (pubspecYamlFile != null) {
           var result = buildSpecialPackageRoot(pubspecYamlFile);
           baseCommands.addAll(result['commands']);
           packageRoot = result['package-root'];
           if (optionsFromFile['packageRoot'] == null ||
               optionsFromFile['packageRoot'] == "") {
             optionsFromFile['packageRoot'] = packageRoot.toNativePath();
           }
       }
     }
@@ skipping 302 matching lines @@
       String htmlPath;
       if (customHtml.existsSync()) {
         // If necessary, run the Polymer deploy steps.
         // TODO(jmesserly): this should be generalized for any tests that
         // require Pub deploy, not just polymer.
         if (customHtml.readAsStringSync().contains('<!--polymer-test')) {
           if (compiler != 'none') {
             commands.add(_polymerDeployCommand(
                 customHtmlPath, tempDir, optionsFromFile));
 
-            htmlPath = '$tempDir/test/$nameNoExt.html';
+            Path pubspecYamlFile = _findPubspecYamlFile(filePath);
+            Path homeDir = pubspecYamlFile == null ? dir :
+                pubspecYamlFile.directoryPath;
+            htmlPath = '$tempDir/${dir.relativeTo(homeDir)}/$nameNoExt.html';
             dartWrapperFilename = '${htmlPath}_bootstrap.dart';
             compiledDartWrapperFilename = '$dartWrapperFilename.js';
           } else {
             htmlPath = customHtmlPath;
           }
         } else {
           htmlPath = '$tempDir/test.html';
           dartWrapperFilename = filePath.toNativePath();
 
           var htmlContents = customHtml.readAsStringSync();
@@ skipping 1012 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);
    }
 }