Added support for skipping redundant dart2js compilations.

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,
  *   and creating [TestCase]s for those files that meet the relevant criteria.
  * - Preparing tests, including copying files and frameworks to temporary
  *   directories, and computing the command line and arguments to be run.
  */
 #library("test_suite");
 
 #import("dart:io");
 #import("dart:isolate");
 #import("status_file_parser.dart");
 #import("test_runner.dart");
 #import("multitest.dart");
 #import("drt_updater.dart");
+#import("dart:uri");
 
 #source("browser_test.dart");
 
 
 // TODO(rnystrom): Add to dart:core?
 /**
  * A simple function that tests [arg] and returns `true` or `false`.
  */
 typedef bool Predicate<T>(T arg);
 
@@ skipping 403 matching lines @@
       Map configuration, Path directory) {
     final name = directory.filename;
 
     return new StandardTestSuite(configuration,
         name, directory,
         ['$directory/$name.status', '$directory/${name}_dart2js.status'],
         isTestFilePredicate: (filename) => filename.endsWith('_test.dart'),
         recursive: true);
   }
 
+  Collection<Uri> get dart2JsBootstrapDependencies {
+    if (useDart2JsFromSdk) {

[ahe, 2012/11/14 18:46:16]

Bail-out early:

if (!useDart2jsFromSdk) return null;

[kustermann, 2012/11/16 14:58:42]

Done.

+      var snapshotPath = TestUtils.absolutePath(new Path(buildDir).
+          join(new Path('dart-sdk/lib/_internal/compiler/implementation/dart2js.dart.snapshot')));

[ricow1, 2012/11/14 08:53:28]

Long line

[ahe, 2012/11/14 18:46:16]

You can always split a string in two using:

new Path('dart-sdk/lib/_internal/compiler/implementation/'
         'dart2js.dart.snapshot')

[kustermann, 2012/11/16 14:58:42]

Done.

[kustermann, 2012/11/16 14:58:42]

Done.

+      return [new Uri("file://$snapshotPath")];

[ahe, 2012/11/14 18:46:16]

See http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx

+    }
+    return null;
+  }
+
+  bool get useDart2JsFromSdk {
+    return configuration['use_sdk'];
+  }
+
   /**
    * The default implementation assumes a file is a test if
    * it ends in "Test.dart".
    */
   bool isTestFile(String filename) {
     // Use the specified predicate, if provided.
     if (isTestFilePredicate != null) return isTestFilePredicate(filename);
 
     return filename.endsWith("Test.dart");
   }
@@ skipping 235 matching lines @@
                           info: info));
     }
   }
 
   List<Command> makeCommands(TestInformation info, var vmOptions, var args) {
     switch (configuration['compiler']) {
     case 'dart2js':
       args = new List.from(args);
       String tempDir = createOutputDirectory(info.filePath, '');
       args.add('--out=$tempDir/out.js');
-      List<Command> commands = <Command>[new Command(dartShellFileName, args)];
+      List<Command> commands = <Command>[new Dart2JsCommand("$tempDir/out.js",
+          !useDart2JsFromSdk, dart2JsBootstrapDependencies, dartShellFileName, args)];

[ahe, 2012/11/14 18:46:16]

Long line.

[ahe, 2012/11/14 18:46:16]

It is not necessary to pass in !useDart2JsFromSdk.  It is implied by
dart2JsBootstrapDependencies being null.

[kustermann, 2012/11/16 14:58:42]

Done.

[kustermann, 2012/11/16 14:58:42]

I changed dart2JsBootstrapDependencies to return [] instead of null in case the
'--use-sdk' was not set.
I think we should keep the neverSkipCompilation flag.

On 2012/11/14 18:46:16, ahe wrote:

       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(new Command(d8FileName, ['$tempDir/out.js']));
       } else if (configuration['runtime'] == 'jsshell') {
         commands.add(new Command(jsShellFileName, ['$tempDir/out.js']));
       }
       return commands;
 
@@ skipping 280 matching lines @@
         args.add(inputFile);
         break;
       default:
         Expect.fail('unimplemented compiler $compiler');
     }
     if (executable.endsWith('.dart')) {
       // Run the compiler script via the Dart VM.
       args.insertRange(0, 1, executable);
       executable = dartShellFileName;
     }
+    if (configuration['compiler'] == 'dart2js') {
+      return new Dart2JsCommand(outputFile, !useDart2JsFromSdk, 
+          dart2JsBootstrapDependencies, dartShellFileName, args);
+    }
     return new Command(executable, args);
   }
 
   /**
    * Create a directory for the generated test.  If a Dart language test
    * needs to be run in a browser, the Dart test needs to be embedded in
    * an HTML page, with a testing framework based on scripting and DOM events.
    * These scripts and pages are written to a generated_test directory
    * inside the build directory of the checkout.
    *
@@ skipping 441 matching lines @@
          '$dartDir/third_party/rhino/1_7R3/js.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-core-1.3.0RC2.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-generator-1.3.0RC2.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-integration-1.3.0RC2.jar',
          '$dartDir/third_party/hamcrest/v1_3/hamcrest-library-1.3.0RC2.jar',
          '$dartDir/third_party/junit/v4_8_2/junit.jar'],
         Platform.operatingSystem == 'windows'? ';': ':');  // Path separator.
   }
 }
 
+class TimeStampCache {
+  Map<String,Date> _cache = <String,Date>{};

[ahe, 2012/11/14 18:46:16]

Add space after comma (twice).

[kustermann, 2012/11/16 14:58:42]

Done.

+
+  /**
+   * Returns the timestamp of the given [Uri] and caches the result for

[ahe, 2012/11/14 18:46:16]

Try to write documentation comments so that the first paragraph is a
summary/heading.  For example:

/**
 * Returns the (cached) timestamp of the given [uri].
 *
 * If [uri] is a local file ...

[kustermann, 2012/11/16 14:58:42]

Done.

+   * future queries. If [uri] is a local file, it's last modified [Date]
+   * will be returned. If the file does not exist, null will be returned
+   * instead.
+   * In case [uri] is not a local file, this method will always return
+   * the current date.
+   */
+  Date getTimeStamp(Uri uri) {

[ahe, 2012/11/14 18:46:16]

I would have called this "getLastModified".

[kustermann, 2012/11/16 14:58:42]

Done.

+    if (uri.scheme == "file") {
+      if (_cache.containsKey(uri.path)) {
+        return _cache[uri.path];
+      }
+      var file = new File(uri.path);
+      _cache[uri.path] = file.existsSync() ? file.lastModifiedSync() : null;
+      return _cache[uri.path];
+    }
+    return new Date.now();
+  }
+}
+
 class TestUtils {
   /**
    * 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 Options().script;
+  static TimeStampCache timestampCache = new TimeStampCache();
 

[Bill Hesse, 2012/11/14 09:37:34]

Why not cache currentDirectoryPath here, the way testScriptPath is cached?

[kustermann, 2012/11/16 14:58:42]

Done.

   /**
    * 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) {
     Directory dir = new Directory.fromPath(base);
     Expect.isTrue(dir.existsSync(),
                   "Expected ${dir} to already exist");
     var segments = relativePath.segments();
     for (String segment in segments) {
@@ skipping 26 matching lines @@
     // When running on a built bot, the file can be made visible in the waterfall UI.
     return ".flaky.log";
   }
 
   static void ensureExists(String filename, Map configuration) {
     if (!configuration['list'] && !(new File(filename).existsSync())) {
       throw "Executable '$filename' does not exist";
     }
   }
 
+  static Path absolutePath(Path path) {
+    if (!path.isAbsolute) {
+      var cwd = new Path(new Directory.current().path);

[Bill Hesse, 2012/11/14 09:37:34]

Can we cache this (new Path(new Directory.current().path))?

[kustermann, 2012/11/16 14:58:42]

Done.

+      return cwd.join(path);
+    }
+    return path;
+  }
+
   static String outputDir(Map configuration) {
     var result = '';
     var system = configuration['system'];
     if (system == 'linux') {
       result = 'out/';
     } else if (system == 'macos') {
       result = 'xcodebuild/';
     } else if (system == 'windows') {
       result = 'build/';
     }
@@ skipping 103 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);
    }
 }