Add temporary directory for dartc compilation of tests.

tools/testing/dart/test_suite.dart

 // Copyright (c) 2011, 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("test_suite");
 
 #import("status_file_parser.dart");
 #import("test_runner.dart");
 #import("multitest.dart");
 
 #source("browser_test.dart");
 
 interface TestSuite {
-  void forEachTest(Function onTest, Map testCache, [Function onDone]);
+  void forEachTest(Function onTest, Map testCache, String globalTempDir(),
+                   [Function onDone]);
 }
 
 
 class CCTestListerIsolate extends Isolate {
   CCTestListerIsolate() : super.heavy();
 
   void main() {
     port.receive((String runnerPath, SendPort replyTo) {
       var p = new Process.start(runnerPath, ["--list"]);
       StringInputStream stdoutStream = new StringInputStream(p.stdout);
@@ skipping 70 matching lines @@
 
       doTest(new TestCase('$suiteName/$testName',
                           runnerPath,
                           args,
                           configuration,
                           completeHandler,
                           expectations));
     }
   }
 
-  void forEachTest(Function onTest, Map testCache, [Function onDone]) {
+  void forEachTest(Function onTest, Map testCache, String globalTempDir(),
+                   [Function onDone]) {
     doTest = onTest;
     doDone = (ignore) => (onDone != null) ? onDone() : null;
 
     var filesRead = 0;
     void statusFileRead() {
       filesRead++;
       if (filesRead == statusFilePaths.length) {
         receiveTestName = new ReceivePort();
         new CCTestListerIsolate().spawn().then((port) {
             port.send(runnerPath, receiveTestName.toSendPort());
@@ skipping 33 matching lines @@
   Map configuration;
   String suiteName;
   String directoryPath;
   List<String> statusFilePaths;
   Function doTest;
   Function doDone;
   int activeTestGenerators = 0;
   bool listingDone = false;
   TestExpectations testExpectations;
   List<TestInformation> cachedTests;
-  final String pathSeparator;
+  final String dartDir;
+  Function globalTemporaryDirectory;
 
   StandardTestSuite(Map this.configuration,
                     String this.suiteName,
                     String this.directoryPath,
                     List<String> this.statusFilePaths)
-    : pathSeparator = new Platform().pathSeparator();
+    : dartDir = TestUtils.dartDir();
 
   bool isTestFile(String filename) => filename.endsWith("Test.dart");
 
   bool listRecursively() => false;
 
   bool complexStatusMatching() => false;
 
   String shellPath() => TestUtils.dartShellFileName(configuration);
 
-  List<String> additionalOptions() => [];
+  List<String> additionalOptions(String filename) => [];
 
-  void forEachTest(Function onTest, Map testCache, [Function onDone = null]) {
+  void forEachTest(Function onTest, Map testCache, String globalTempDir(),
+                   [Function onDone = null]) {
     doTest = onTest;
     doDone = (onDone != null) ? onDone : (() => null);
+    globalTemporaryDirectory = globalTempDir;
 
     var filesRead = 0;
     void statusFileRead() {
       filesRead++;
       if (filesRead == statusFilePaths.length) {
         // Checked if we have already found and generated the tests for
         // this suite.
         if (!testCache.containsKey(suiteName)) {
           cachedTests = testCache[suiteName] = [];
           processDirectory();
@@ skipping 160 matching lines @@
     if (optionsFromFile['isMultitest']) return;
     bool isWebTest = optionsFromFile['containsDomImport'];
     bool isLibraryDefinition = optionsFromFile['isLibraryDefinition'];
     if (!isLibraryDefinition && optionsFromFile['containsSourceOrImport']) {
       print('Warning for $filename: Browser tests require #library ' +
             'in any file that uses #import or #source');
     }
 
     final String component = configuration['component'];
     final String testPath = new File(filename).fullPathSync();
-    String dartDir = new File('.').fullPathSync();
-    if (!testPath.startsWith(dartDir) ||
-        dartDir.endsWith('/frog')) {
-      dartDir = new File('..').fullPathSync();
-      if (!testPath.startsWith(dartDir)) {
-        print('Run test.dart from the dart directory or' +
-              ' an immediate subdirectory only.');
-        Expect.fail('Could not find top level dart directory.');
-      }
-    }
 
     for (var vmOptions in optionsFromFile['vmOptions']) {
       // 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 (optionsFromFile['vmOptions'].length > 1) {
           optionsName = Strings.join(vmOptions, '-').replaceAll('-','')
                                                     .replaceAll('=','')
                                                     .replaceAll('/','');
       }
       Directory tempDir =
-          createTemporaryDirectory(testPath, dartDir, optionsName);
+          createTemporaryDirectory(testPath, optionsName);
 
       String dartWrapperFilename = '${tempDir.path}/test.dart';
       String compiledDartWrapperFilename = '${tempDir.path}/test.js';
       String domLibraryImport = (component == 'chromium') ?
           '$dartDir/client/testing/unittest/dom_for_unittest.dart' : 'dart:dom';
 
       String htmlPath = '${tempDir.path}/test.html';
       if (!isWebTest) {
         // test.dart will import the dart test directly, if it is a library,
         // or indirectly through test_as_library.dart, if it is not.
@@ skipping 95 matching lines @@
           executable,
           args,
           configuration,
           completeHandler,
           expectations,
           optionsFromFile['isNegative']);
       doTest(testCase);
     }
   }
 
+  bool get requiresCleanTemporaryDirectory() =>
+      configuration['component'] == 'dartc' ||
+      configuration['component'] == 'chromium';
+
   /**
    * Create a directory for the generated test.  Drop the path to the
    * dart checkout and the final ".dart" from the test path, and replace
    * all path separators with underscores.
    */
   Directory createTemporaryDirectory(String testPath,

[Mads Ager (google), 2012/01/18 15:26:29]

This confused me a little. Maybe we should call this createOutputDirectory
instead? With the current name I thought that we should always call
globalTemporaryDirectory.

-                                     String dartDir,
                                      String optionsName) {
     String testUniqueName =
         testPath.substring(dartDir.length + 1, testPath.length - 5);
     testUniqueName = testUniqueName.replaceAll('/', '_');
     testUniqueName += '-$optionsName';
+
     // Create '[build dir]/generated_tests/$component/$testUniqueName',
       // including any intermediate directories that don't exist.
-    var generatedTestPath = ['generated_tests',
+    String debugMode =
+        (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
+    var generatedTestPath = [debugMode + configuration["arch"],
+                             'generated_tests',
                              configuration['component'],
                              testUniqueName];
 
     String tempDirPath = TestUtils.buildDir(configuration);
+    if (requiresCleanTemporaryDirectory) {
+      tempDirPath = globalTemporaryDirectory();
+    }
     Directory tempDir = new Directory(tempDirPath);
     if (!tempDir.existsSync()) {
       // Dartium tests can be run with no build step, with no output directory.
       // This special case builds the build directory that should be there.
       var buildPath = tempDirPath.split('/');
       tempDirPath = buildPath[0];
       if (tempDirPath == '') {
         throw new Exception(
             'Non-relative path to build directory in test_suite.dart');
       }
@@ skipping 62 matching lines @@
     }
   }
 
   void completeHandler(TestCase testCase) {
   }
 
   List<List<String>> argumentListsFromFile(String filename,
                                            Map optionsFromFile,
                                            bool enableFatalTypeErrors) {
     List args = TestUtils.standardOptions(configuration);
-    args.addAll(additionalOptions());
+    args.addAll(additionalOptions(filename));
     if (enableFatalTypeErrors && configuration['component'] == 'dartc') {
       args.add('--fatal-type-errors');
     }
 
     bool isMultitest = optionsFromFile["isMultitest"];
     List<String> dartOptions = optionsFromFile["dartOptions"];
     List<List<String>> vmOptionsList = optionsFromFile["vmOptions"];
     Expect.isTrue(!isMultitest || dartOptions == null);
     if (dartOptions == null) {
       args.add(filename);
@@ skipping 114 matching lines @@
   void activityStarted() { ++activityCount; }
 
   void activityCompleted() {
     if (--activityCount == 0) {
       directoryListingDone(true);
     }
   }
 
   String shellPath() => TestUtils.compilerPath(configuration);
 
-  List<String> additionalOptions() {
-    // TODO(ager): potentially register cleanup action to delete the temporary
-    // directories?
-    var tempDir = new Directory('');
-    tempDir.createTempSync();
+  List<String> additionalOptions(String filename) {
+    filename = new File(filename).fullPathSync();
+    Directory tempDir = createTemporaryDirectory(filename, 'dartc-test');
     return
         [ '--fatal-warnings', '--fatal-type-errors', 
           '-check-only', '-out', tempDir.path];
   }
 
   void processDirectory() {
     directoryPath = getDirname(directoryPath);
     // Enqueueing the directory listers is an activity.
     activityStarted();
     for (String testDir in _testDirs) {
@@ skipping 12 matching lines @@
     activityCompleted();
   }
 }
 
 
 class JUnitTestSuite implements TestSuite {
   Map configuration;
   String suiteName;
   String directoryPath;
   String statusFilePath;
-  String dartDir;
+  final String dartDir;
   String buildDir;
   String classPath;
   List<String> testClasses;
   Function doTest;
   Function doDone;
   TestExpectations testExpectations;
 
   JUnitTestSuite(Map this.configuration,
                  String this.suiteName,
                  String this.directoryPath,
-                 String this.statusFilePath);
+                 String this.statusFilePath)
+      : dartDir = TestUtils.dartDir();
 
   bool isTestFile(String filename) => filename.endsWith("Tests.java") &&
       !filename.contains('com/google/dart/compiler/vm') &&
       !filename.contains('com/google/dart/corelib/SharedTests.java');
 
   void forEachTest(Function onTest,
                    Map testCacheIgnored,
+                   String globalTempDir(),
                    [Function onDone = null]) {
     doTest = onTest;
     doDone = (onDone != null) ? onDone : (() => null);
 
     if (configuration['component'] != 'dartc') {
       // Do nothing.  Asynchronously report that the suite is enqueued.
       new Timer((timerUnused){ doDone(); }, 0);
       return;
     }
     RegExp pattern = configuration['selectors']['dartc'];
     if (!pattern.hasMatch('junit_tests')) {
       new Timer((timerUnused){ doDone(); }, 0);
       return;
     }
 
-    dartDir = new File('.').fullPathSync();
-    if (dartDir.endsWith('compiler')) {
-      dartDir = new File('..').fullPathSync();
-      if (!new File('$dartDir/tools/test.dart').existsSync()) {
-        throw new Exception('Cannot find client checkout $dartDir');
-      }
-    }
     buildDir = TestUtils.buildDir(configuration);
     computeClassPath();
     testClasses = <String>[];
     // Do not read the status file.
     // All exclusions are hardcoded in this script, as they are in testcfg.py.
     processDirectory();
   }
 
   void processDirectory() {
     directoryPath = getDirname(directoryPath);
@@ skipping 132 matching lines @@
     return outputDir;
   }
 
   static String buildDir(Map configuration) {
     var buildDir = outputDir(configuration);
     buildDir += (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
     buildDir += configuration['arch'];
     return buildDir;
   }
 
+  static String dartDir() {
+    Directory dart;
+    if (new File('tools/testing/dart/test_suite.dart').existsSync()) {
+      return new File('.').fullPathSync();
+    } else if (new File('../tools/testing/dart/test_suite.dart').existsSync()) {
+      return new File('..').fullPathSync();
+    } else {
+      print('Run test.dart from the dart directory or' +
+            ' an immediate subdirectory only.');
+      Expect.fail('Could not find top level dart directory.');
+    }
+  }
+
   static List<String> standardOptions(Map configuration) {
     List args = ["--ignore-unrecognized-flags"];
     if (configuration["checked"]) {
       args.add('--enable_asserts');
       args.add("--enable_type_checks");
     }
     if (configuration["component"] == "leg") {
       args.add("--enable_leg");
       args.add("--leg_only");
     }
@@ skipping 50 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);
    }
 }