Reduce test.dart memory usage.

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 187 matching lines @@
           ? '$buildDir/dart-sdk/bin/dart$suffix'
           : '$buildDir/dart$suffix';
     }
 
     TestUtils.ensureExists(dartExecutable, configuration);
     return dartExecutable;
   }
 
   String get d8FileName {
     var suffix = getExecutableSuffix('d8');
-    var d8Dir = TestUtils.dartDir().append('third_party/d8');
+    var d8Dir = TestUtils.dartDir.append('third_party/d8');
     var d8Path = d8Dir.append('${Platform.operatingSystem}/d8$suffix');
     var d8 = d8Path.toNativePath();
     TestUtils.ensureExists(d8, configuration);
     return d8;
   }
 
   String get jsShellFileName {
     var executableSuffix = getExecutableSuffix('jsshell');
     var executable = 'jsshell$executableSuffix';
-    var jsshellDir = '${TestUtils.dartDir()}/tools/testing/bin';
+    var jsshellDir = '${TestUtils.dartDir}/tools/testing/bin';
     return '$jsshellDir/$executable';
   }
 
   /**
    * The file extension (if any) that should be added to the given executable
    * name for the current platform.
    */
   // TODO(ahe): Get rid of this. Use executableBinarySuffix instead.
   String getExecutableSuffix(String executable) {
     if (Platform.operatingSystem == 'windows') {
@@ skipping 27 matching lines @@
   // and will enqueue the test (if necessary).
   void enqueueNewTestCase(TestCase testCase) {
     var expectations = testCase.expectedOutcomes;
 
     // Handle sharding based on the original test path (i.e. all multitests
     // of a given original test belong to the same shard)
     int shards = configuration['shards'];
     if (shards > 1) {
       int shard = configuration['shard'];
       var testPath =
-          testCase.info.originTestPath.relativeTo(TestUtils.dartDir());
+          testCase.info.originTestPath.relativeTo(TestUtils.dartDir);
       if ("$testPath".hashCode % shards != shard - 1) {
         return;
       }
     }
     // Test if the selector includes this test.
     RegExp pattern = configuration['selectors'][suiteName];
     if (!pattern.hasMatch(testCase.displayName)) {
       return;
     }
 
@@ skipping 13 matching lines @@
     if (expectations.contains(Expectation.SKIP) ||
         expectations.contains(Expectation.SKIP_BY_DESIGN)) {
       return;
     }
 
     doTest(testCase);
   }
 
   String createGeneratedTestDirectoryHelper(
       String name, String dirname, Path testPath, String optionsName) {
-    Path relative = testPath.relativeTo(TestUtils.dartDir());
+    Path relative = testPath.relativeTo(TestUtils.dartDir);
     relative = relative.directoryPath.append(relative.filenameWithoutExtension);
     String testUniqueName = TestUtils.getShortName(relative.toString());
     if (!optionsName.isEmpty) {
       testUniqueName = '$testUniqueName-$optionsName';
     }
 
     Path generatedTestPath = new Path(buildDir)
         .append('generated_$name')
         .append(dirname)
         .append(testUniqueName);
@@ skipping 46 matching lines @@
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var packages = configuration['use_public_packages']
         ? '-public_packages' : '';
     var dirName = "${configuration['compiler']}"
                   "$checked$minified$csp$packages$sdk";
     return createGeneratedTestDirectoryHelper(
         "compilations", dirName, testPath, "");
   }
 
   String createPubspecCheckoutDirectory(Path directoryOfPubspecYaml) {
-    var relativeDir = directoryOfPubspecYaml.relativeTo(TestUtils.dartDir());
+    var relativeDir = directoryOfPubspecYaml.relativeTo(TestUtils.dartDir);
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var pkg = configuration['use_public_packages']
         ? 'public_packages' : 'repo_packages';
     return createGeneratedTestDirectoryHelper(
         "pubspec_checkouts", '$pkg$sdk', directoryOfPubspecYaml, "");
   }
 
   String createPubPackageBuildsDirectory(Path directoryOfPubspecYaml) {
-    var relativeDir = directoryOfPubspecYaml.relativeTo(TestUtils.dartDir());
+    var relativeDir = directoryOfPubspecYaml.relativeTo(TestUtils.dartDir);
     var pkg = configuration['use_public_packages']
         ? 'public_packages' : 'repo_packages';
     return createGeneratedTestDirectoryHelper(
         "pub_package_builds", pkg, directoryOfPubspecYaml, "");
   }
 
   /**
    * Helper function for discovering the packages in the dart repository.
    */
   Future<List> listDir(Path path, Function isValid) {
@@ skipping 16 matching lines @@
     /*
      * Layout of packages inside the dart repository:
      *  dart/
      *      pkg/PACKAGE_NAME
      *      pkg/third_party/PACKAGE_NAME
      *      third_party/pkg/PACKAGE_NAME
      */
 
     isValid(packageName) => packageName != 'third_party';
 
-    var dartDir = TestUtils.dartDir();
+    var dartDir = TestUtils.dartDir;
     var futures = [
       listDir(dartDir.append('pkg'), isValid),
       listDir(dartDir.append('pkg').append('third_party'), isValid),
       listDir(dartDir.append('third_party').append('pkg'), isValid),
     ];
     return Future.wait(futures).then((results) {
       var packageDirectories = {};
       for (var result in results) {
         for (var packageTuple in result) {
           String packageName = packageTuple[0];
@@ skipping 12 matching lines @@
   Future<Map> discoverSamplesInRepository() {
     /*
      * Layout of samples inside the dart repository:
      *  dart/
      *      samples/SAMPLE_NAME
      *      samples/third_party/SAMPLE_NAME
      */
 
     isValid(packageName) => packageName != 'third_party';
 
-    var dartDir = TestUtils.dartDir();
+    var dartDir = TestUtils.dartDir;
     var futures = [
       listDir(dartDir.append('samples'), isValid),
       listDir(dartDir.append('samples').append('third_party'), isValid),
     ];
     return Future.wait(futures).then((results) {
       var packageDirectories = {};
       for (var result in results) {
         for (var packageTuple in result) {
           String packageName = packageTuple[0];
           String fullPath = packageTuple[1];
@@ skipping 47 matching lines @@
   final String dartDir;
   List<String> statusFilePaths;
   VoidFunction doDone;
 
   CCTestSuite(Map configuration,
               String suiteName,
               String runnerName,
               this.statusFilePaths,
               {this.testPrefix: ''})
       : super(configuration, suiteName),
-        dartDir = TestUtils.dartDir().toNativePath() {
+        dartDir = TestUtils.dartDir.toNativePath() {
     // For running the tests we use the given '$runnerName' binary
     targetRunnerPath = '$buildDir/$runnerName';
 
     // For listing the tests we use the '$runnerName.host' binary if it exists
     // and use '$runnerName' if it doesn't.
     var binarySuffix = Platform.operatingSystem == 'windows' ? '.exe' : '';
     var hostBinary = '$targetRunnerPath.host$binarySuffix';
     if (new File(hostBinary).existsSync()) {
       hostRunnerPath = hostBinary;
     } else {
@@ skipping 74 matching lines @@
   final bool listRecursively;
   final extraVmOptions;
 
   StandardTestSuite(Map configuration,
                     String suiteName,
                     Path suiteDirectory,
                     this.statusFilePaths,
                     {this.isTestFilePredicate,
                     bool recursive: false})
   : super(configuration, suiteName),
-    dartDir = TestUtils.dartDir(),
+    dartDir = TestUtils.dartDir,
     listRecursively = recursive,
-    suiteDir = TestUtils.dartDir().join(suiteDirectory),
+    suiteDir = TestUtils.dartDir.join(suiteDirectory),
     extraVmOptions = TestUtils.getExtraVmOptions(configuration);
 
   /**
    * Creates a test suite whose file organization matches an expected structure.
    * To use this, your suite should look like:
    *
    *     dart/
    *       path/
    *         to/
    *           mytestsuite/
@@ skipping 165 matching lines @@
       createTestCase(filePath,
                      optionsFromFile['hasCompileError'],
                      optionsFromFile['hasRuntimeError'],
                      hasStaticWarning: optionsFromFile['hasStaticWarning']);
     }
   }
 
   static Path _findPubspecYamlFile(Path filePath) {
     final existsCache = TestUtils.existsCache;
 
-    Path root = TestUtils.dartDir();
+    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())) {
@@ skipping 27 matching lines @@
 
       // NOTE: We make a link in the package-root to [packageName], since
       // 'pub get' doesn't create the link to the package containing
       // pubspec.yaml if there is no lib directory.
       var packageLink = newPackageRoot.append(packageName);
       var packageLinkTarget = packageDir.append('lib');
 
       // NOTE: We make a link in the package-root to pkg/expect, since
       // 'package:expect' is not available on pub.dartlang.org!
       var expectLink = newPackageRoot.append('expect');
-      var expectLinkTarget = TestUtils.dartDir()
+      var expectLinkTarget = TestUtils.dartDir
           .append('pkg').append('expect').append('lib');
 
       // Generate dependency overrides if we use repository packages.
       var packageDirectories = {};
       if (configuration['use_repository_packages']) {
         packageDirectories = new Map.from(localPackageDirectories);
         // Do not create an dependency override for the package itself.
         if (packageDirectories.containsKey(packageName)) {
           packageDirectories.remove(packageName);
         }
@@ skipping 191 matching lines @@
    * the relative path to either the dart or the build directory.
    * Thus, the returned [String] will be the path component of the URL
    * corresponding to [file] (the http server serves files relative to the
    * dart/build directories).
    */
   String _createUrlPathFromFile(Path file) {
     file = TestUtils.absolutePath(file);
 
     var relativeBuildDir = new Path(TestUtils.buildDir(configuration));
     var buildDir = TestUtils.absolutePath(relativeBuildDir);
-    var dartDir = TestUtils.absolutePath(TestUtils.dartDir());
+    var dartDir = TestUtils.absolutePath(TestUtils.dartDir);
 
     var fileString = file.toString();
     if (fileString.startsWith(buildDir.toString())) {
       var fileRelativeToBuildDir = file.relativeTo(buildDir);
       return "/$PREFIX_BUILDDIR/$fileRelativeToBuildDir";
     } else if (fileString.startsWith(dartDir.toString())) {
       var fileRelativeToDartDir = file.relativeTo(dartDir);
       return "/$PREFIX_DARTDIR/$fileRelativeToDartDir";
     }
     // Unreachable
@@ skipping 674 matching lines @@
                      TestExpectations testExpectations) {
       enqueueTestCase(String packageName, String directory) {
         var absoluteDirectoryPath = new Path(directory);
 
         // Early return if this package is not using pub.
         if (!fileExists(absoluteDirectoryPath.append('pubspec.yaml'))) {
           return;
         }
 
         var directoryPath =
-            absoluteDirectoryPath.relativeTo(TestUtils.dartDir());
+            absoluteDirectoryPath.relativeTo(TestUtils.dartDir);
         var testName = "$directoryPath";
         var displayName = '$suiteName/$testName';
         var packageName = directoryPath.filename;
 
         // Collect necessary paths for pubspec.yaml overrides, pub-cache, ...
         var checkoutDir =
             createPubPackageBuildsDirectory(absoluteDirectoryPath);
         var cacheDir = new Path(checkoutDir).append("pub-cache").toNativePath();
         var pubspecYamlFile =
             new Path(checkoutDir).append('pubspec.yaml').toNativePath();
@@ skipping 48 matching lines @@
       localSampleDirectories.forEach(enqueueTestCase);
 
       // Notify we're done
       if (onDone != null) onDone();
     }
 
     doTest = onTest;
     Map<String, String> _localPackageDirectories;
     Map<String, String> _localSampleDirectories;
     List<String> statusFiles = [
-        TestUtils.dartDir().join(new Path(statusFilePath)).toNativePath()];
+        TestUtils.dartDir.join(new Path(statusFilePath)).toNativePath()];
     ReadTestExpectations(statusFiles, configuration).then((expectations) {
       Future.wait([discoverPackagesInRepository(),
                    discoverSamplesInRepository()]).then((List results) {
         Map packageDirectories = results[0];
         Map sampleDirectories = results[1];
         enqueueTestCases(packageDirectories, sampleDirectories, expectations);
       });
     });
   }
 }
@@ skipping 45 matching lines @@
    * The libraries in this directory relies on finding various files
    * relative to the 'test.dart' script in '.../dart/tools/test.dart'. If
    * the main script using 'test_suite.dart' is not there, the main
    * script must set this to '.../dart/tools/test.dart'.
    */
   static String testScriptPath = new Path(Platform.script.path).toNativePath();
   static LastModifiedCache lastModifiedCache = new LastModifiedCache();
   static ExistsCache existsCache = new ExistsCache();
   static Path currentWorkingDirectory =
       new Path(Directory.current.path);
+  static Path dartDir = new Path(new File(testScriptPath).absolute.path)
+      .directoryPath.directoryPath;
+
   /**
    * Creates a directory using a [relativePath] to an existing
    * [base] directory if that [relativePath] does not already exist.
    */
   static Directory mkdirRecursive(Path base, Path relativePath) {
     if (relativePath.isAbsolute) {
       base = new Path('/');
     }
     Directory dir = new Directory(base.toNativePath());
     assert(dir.existsSync());
@@ skipping 80 matching lines @@
     if (system == 'linux') {
       result = 'out/';
     } else if (system == 'macos') {
       result = 'xcodebuild/';
     } else if (system == 'windows') {
       result = 'build/';
     }
     return result;
   }
 
-  static Path dartDir() {
-    File scriptFile = new File(testScriptPath);
-    Path scriptPath = new Path(scriptFile.absolute.path);
-    return scriptPath.directoryPath.directoryPath;
-  }
-
   static List<String> standardOptions(Map configuration) {
     List args = ["--ignore-unrecognized-flags"];
     if (configuration["checked"]) {
       args.add('--enable_asserts');
       args.add("--enable_type_checks");
     }
     String compiler = configuration["compiler"];
     if (compiler == "dart2js" || compiler == "dart2dart") {
       args = [];
       if (configuration["checked"]) {
@@ skipping 71 matching lines @@
     return normal;
   }
 
   static String configurationDir(Map configuration) {
     // For regular dart checkouts, the configDir by default is mode+arch.
     // For Dartium, the configDir by default is mode (as defined by the Chrome
     // build setup). We can detect this because in the dartium checkout, the
     // "output" directory is a sibling of the dart directory instead of a child.
     var mode = (configuration['mode'] == 'debug') ? 'Debug' : 'Release';
     var arch = configuration['arch'].toUpperCase();
-    if (currentWorkingDirectory != dartDir()) {
+    if (currentWorkingDirectory != dartDir) {
       return getValidOutputDir(configuration, mode, arch);
     } else {
       return mode;
     }
   }
 
   /**
    * Returns the path to the dart binary checked into the repo, used for
    * bootstrapping test.dart.
    */
   static Path get dartTestExecutable {
-    var path = '${TestUtils.dartDir()}/tools/testing/bin/'
+    var path = '$dartDir/tools/testing/bin/'
         '${Platform.operatingSystem}/dart';
     if (Platform.operatingSystem == 'windows') {
       path = '$path.exe';
     }
     return new Path(path);
   }
 
   /**
    * Gets extra vm options passed to the testing script.
    */
@@ skipping 112 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);
   }
 }