Fixed (currently harmless) bug in test_runner and implemented separate dart2js compilation cache

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 758 matching lines @@
       }
     }
     return negative;
   }
 
   List<Command> makeCommands(TestInformation info, var vmOptions, var args) {
     var compiler = configuration['compiler'];
     switch (compiler) {
     case 'dart2js':
       args = new List.from(args);
-      String tempDir = createOutputDirectory(info.filePath, '');
+      String tempDir = createCompilationOutputDirectory(info.filePath);
       args.add('--out=$tempDir/out.js');
 
       var command = CommandBuilder.instance.getCompilationCommand(
           compiler, "$tempDir/out.js", !useSdk,
           dart2JsBootstrapDependencies, compilerPath, args, configurationDir);
 
       List<Command> commands = <Command>[command];
       if (info.hasCompileError) {
         // Do not attempt to run the compiled result. A compilation
         // error should be reported by the compilation command.
       } else if (configuration['runtime'] == 'd8') {
         commands.add(CommandBuilder.instance.getJSCommandlineCommand(
             "d8", d8FileName, ['$tempDir/out.js'], configurationDir));
       } else if (configuration['runtime'] == 'jsshell') {
         commands.add(CommandBuilder.instance.getJSCommandlineCommand(
             "jsshell", jsShellFileName, ['$tempDir/out.js'], configurationDir));
       }
       return commands;
-
     case 'dart2dart':
       args = new List.from(args);
       args.add('--output-type=dart');
-      String tempDir = createOutputDirectory(info.filePath, '');
+      String tempDir = createCompilationOutputDirectory(info.filePath);
       args.add('--out=$tempDir/out.dart');
 
       List<Command> commands =
           <Command>[CommandBuilder.instance.getCompilationCommand(
               compiler, "$tempDir/out.dart", !useSdk,
               dart2JsBootstrapDependencies, compilerPath, args,
               configurationDir)];
       if (info.hasCompileError) {
         // Do not attempt to run the compiled result. A compilation
         // error should be reported by the compilation command.
@@ skipping 141 matching lines @@
     for (var vmOptions in getVmOptions(optionsFromFile)) {
       // Create a unique temporary directory for each set of vmOptions.
       // TODO(dart:429): Replace separate replaceAlls with a RegExp when
       // replaceAll(RegExp, String) is implemented.
       String optionsName = '';
       if (getVmOptions(optionsFromFile).length > 1) {
           optionsName = vmOptions.join('-').replaceAll('-','')
                                            .replaceAll('=','')
                                            .replaceAll('/','');
       }
+      final String compilationTempDir =
+          createCompilationOutputDirectory(info.filePath);
       final String tempDir = createOutputDirectory(info.filePath, optionsName);
 
       String dartWrapperFilename = '$tempDir/test.dart';
-      String compiledDartWrapperFilename = '$tempDir/test.js';
-      String precompiledDartWrapperFilename = '$tempDir/test.precompiled.js';
+      String compiledDartWrapperFilename = '$compilationTempDir/test.js';
+      String precompiledDartWrapperFilename =
+          '$compilationTempDir/test.precompiled.js';
 
       String content = null;
       Path dir = filePath.directoryPath;
       String nameNoExt = filePath.filenameWithoutExtension;
 
       Path pngPath = dir.append('$nameNoExt.png');
       Path txtPath = dir.append('$nameNoExt.txt');
       String customHtmlPath = dir.append('$nameNoExt.html').toNativePath();
       File customHtml = new File(customHtmlPath);
 
@@ skipping 235 matching lines @@
     if (!optionsName.isEmpty) {
       testUniqueName = '$testUniqueName-$optionsName';
     }
 
     // Create '[build dir]/generated_tests/$compiler-$runtime/$testUniqueName',
     // including any intermediate directories that don't exist.
     // If the tests are run in checked or minified mode we add that to the
     // '$compile-$runtime' directory name.
     var checked = configuration['checked'] ? '-checked' : '';
     var minified = configuration['minified'] ? '-minified' : '';
     var csp = configuration['csp'] ? '-csp' : '';

[ricow1, 2013/10/15 11:03:24]

I guess we don't need this here either

[kustermann, 2013/10/15 11:50:23]

Well, we do, because we the *html file lives in there, and if one configuration
is with csp mode and the other one without we've got a race condition.

(but we'll be able to remove this stuff eventually as well).

     var dirName = "${configuration['compiler']}-${configuration['runtime']}"
                   "$checked$minified$csp";
     Path generatedTestPath = new Path(buildDir)
         .append('generated_tests')
         .append(dirName)
         .append(testUniqueName);
 
     TestUtils.mkdirRecursive(new Path('.'), generatedTestPath);
     return new File(generatedTestPath.toNativePath()).fullPathSync()
         .replaceAll('\\', '/');
   }
 
+  String createCompilationOutputDirectory(Path testPath) {
+    Path relative = testPath.relativeTo(TestUtils.dartDir());

[ricow1, 2013/10/15 11:03:24]

how about extracting these 3 lines into a method and using it from here and from
createOutputDirectory. Even better, these two methods share something like 90%
of their code, just extract all that into a single function

[kustermann, 2013/10/15 11:50:23]

Done.

+    relative = relative.directoryPath.append(relative.filenameWithoutExtension);
+    String testUniqueName = relative.toString().replaceAll('/', '_');
+
+    // Create
+    // '[build dir]/generated_compilations/$compiler-$flags/$testUniqueName',
+    // including any intermediate directories that don't exist.
+    var checked = configuration['checked'] ? '-checked' : '';
+    var minified = configuration['minified'] ? '-minified' : '';
+    var dirName = "${configuration['compiler']}$checked$minified";
+    Path generatedTestPath = new Path(buildDir)
+        .append('generated_compilations')
+        .append(dirName)
+        .append(testUniqueName);
+
+    TestUtils.mkdirRecursive(new Path('.'), generatedTestPath);
+    return new File(generatedTestPath.toNativePath()).fullPathSync()
+        .replaceAll('\\', '/');
+  }
+
   String get scriptType {
     switch (configuration['compiler']) {
       case 'none':
       case 'dart2dart':
         return 'application/dart';
       case 'dart2js':
       case 'dartanalyzer':
       case 'dart2analyzer':
         return 'text/javascript';
       default:
@@ skipping 776 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);
    }
 }