Revert "Changing paths to JS files in generated test HTML files to be relative paths rather than ab…

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 608 matching lines @@
       Path pngPath = dir.append('$nameNoExt.png');
       Path txtPath = dir.append('$nameNoExt.txt');
       Path expectedOutput = null;
       if (new File.fromPath(pngPath).existsSync()) {
         expectedOutput = pngPath;
         content = getHtmlLayoutContents(scriptType, '$filePrefix$scriptPath');
       } else if (new File.fromPath(txtPath).existsSync()) {
         expectedOutput = txtPath;
         content = getHtmlLayoutContents(scriptType, '$filePrefix$scriptPath');
       } else {
-        final htmlLocation = new Path(htmlPath);
         content = getHtmlContents(
           filename,
-          _relativize(htmlLocation, dartDir.append(
-              'pkg/unittest/test_controller.js')),
-          _relativize(htmlLocation, dartDir.append('client/dart.js')),
+          '$filePrefix${dartDir.append("pkg/unittest/test_controller.js")}',
+          '$filePrefix${dartDir.append("client/dart.js")}',
           scriptType,
-          _relativize(htmlLocation, new Path(scriptPath)));
+          '$filePrefix$scriptPath');
       }
       htmlTest.writeStringSync(content);
       htmlTest.closeSync();
 
       // Construct the command(s) that compile all the inputs needed by the
       // browser test. For running Dart in DRT, this will be noop commands.
       List<Command> commands = [];
       if (compiler != 'none') {
         commands.add(_compileCommand(
             dartWrapperFilename, compiledDartWrapperFilename,
@@ skipping 373 matching lines @@
              "isolateStubs": isolateStubs,
              "containsDomImport": containsDomImport,
              "isLibraryDefinition": isLibraryDefinition,
              "containsSourceOrImport": containsSourceOrImport,
              "numStaticTypeAnnotations": numStaticTypeAnnotations,
              "numCompileTimeAnnotations": numCompileTimeAnnotations};
   }
 
   List<List<String>> getVmOptions(Map optionsFromFile) {
     bool needsVmOptions =
-        Contains(configuration['compiler'],
-            const ['none', 'dart2dart', 'dartc']) &&
-        Contains(configuration['runtime'],
-            const ['none', 'vm', 'drt', 'dartium']);
+        Contains(configuration['compiler'], const ['none', 'dart2dart', 'dartc']) &&
+        Contains(configuration['runtime'], const ['none', 'vm', 'drt', 'dartium']);
     if (!needsVmOptions) return [[]];
     return optionsFromFile['vmOptions'];
   }
-
-  String _relativize(Path base, Path path) {
-    base = base.canonicalize();
-    path = path.canonicalize();
-
-    if (!base.isAbsolute || !path.isAbsolute) {
-      throw "Only absolute paths are supported.";
-    }
-    List<String> pathSegments = path.segments();
-    List<String> baseSegments = base.segments();
-    int common = 0;
-    int length = Math.min(pathSegments.length, baseSegments.length);
-    while (common < length && pathSegments[common] == baseSegments[common]) {
-      common++;
-    }
-    final sb = new StringBuffer();
-    for (int i = common + 1; i < baseSegments.length; i++) {
-      sb.add('..${Platform.pathSeparator}');
-    }
-    for (int i = common; i < pathSegments.length - 1; i++) {
-      sb.add('${pathSegments[i]}${Platform.pathSeparator}');
-    }
-    sb.add('${pathSegments.last()}');
-    return sb.toString();
-  }
 }
 
 
 class DartcCompilationTestSuite extends StandardTestSuite {
   List<String> _testDirs;
   int activityCount = 0;
 
   DartcCompilationTestSuite(Map configuration,
                             String suiteName,
                             String directoryPath,
@@ skipping 370 matching lines @@
  * $noCrash tests are expected to be flaky but not crash
  * $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
 """;
     print(report);
    }
 }