Add get_drt.py to test.dart, so that testing browser components updates DumpRenderTree.

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:builtin");
 #import("dart:isolate");
 #import("status_file_parser.dart");
 #import("test_runner.dart");
 #import("multitest.dart");
+#import("drt_updater.dart");
 
 #source("browser_test.dart");
 
 
 /**
  * A TestSuite represents a collection of tests.  It creates a [TestCase]
  * object for each test to be run, and passes the test cases to a callback.
  *
  * Most TestSuites represent a directory or directory tree containing tests,
  * and a status file containing the expected results when these tests are run.
@@ skipping 183 matching lines @@
   bool isTestFile(String filename) => filename.endsWith("Test.dart");
 
   bool listRecursively() => false;
 
   String shellPath() => TestUtils.dartShellFileName(configuration);
 
   List<String> additionalOptions(String filename) => [];
 
   void forEachTest(Function onTest, Map testCache, String globalTempDir(),
                    [Function onDone = null]) {
+    // If DumpRenderTree is required, and not yet updated, wait for update.
+    if (DumpRenderTreeUpdater.componentRequiresDRT(configuration['component'])
+        && !DumpRenderTreeUpdater.updated) {
+      Expect.isTrue(DumpRenderTreeUpdater.isActive);
+      DumpRenderTreeUpdater.onUpdated.add(() {
+        forEachTest(onTest, testCache, globalTempDir, onDone);
+      });
+      return;
+    }
+
     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.
@@ skipping 83 matching lines @@
     }
     Set<String> expectations = testExpectations.expectations(testName);
     if (configuration['report']) {
       // Tests with multiple VMOptions are counted more than once.
       for (var dummy in optionsFromFile["vmOptions"]) {
         SummaryReport.add(expectations);
       }
     }
     if (expectations.contains(SKIP)) return;
 
-    switch (configuration['component']) {
-      case 'dartium':
-      case 'chromium':
-      case 'frogium':
-      case 'legium':
-      case 'webdriver':
-        enqueueBrowserTest(filename, testName, optionsFromFile,
-                           expectations, isNegative);
-        break;
-      default:
-        isNegative = isNegative ||
-            (configuration['checked'] && info.isNegativeIfChecked);
-
-        if (configuration['component'] == 'dartc') {
-          // dartc can detect static type warnings by the
-          // format of the error line
-          if (info.hasFatalTypeErrors) {
-            isNegative = true;
-          } else if (info.hasRuntimeErrors) {
-            isNegative = false;
-          }
-        }
-
-        var argumentLists = argumentListsFromFile(filename,
-                                                  optionsFromFile);
-
-        for (var args in argumentLists) {
-          doTest(new TestCase('$suiteName/$testName',
-                              [new Command(shellPath(), args)],
-                              configuration,
-                              completeHandler,
-                              expectations,
-                              isNegative,
-                              info));
-        }
+    if (TestUtils.isBrowserComponent(configuration['component'])) {
+      enqueueBrowserTest(info, testName, expectations);
+    } else {
+      enqueueStandardTest(info, testName, expectations);
     }
   }
 
+  void enqueueStandardTest(TestInformation info,
+                           String testName,
+                           Set<String> expectations) {
+    bool isNegative = info.isNegative ||
+        (configuration['checked'] && info.isNegativeIfChecked);
+
+    if (configuration['component'] == 'dartc') {
+      // dartc can detect static type warnings by the
+      // format of the error line
+      if (info.hasFatalTypeErrors) {
+        isNegative = true;
+      } else if (info.hasRuntimeErrors) {
+        isNegative = false;
+      }
+    }
+
+    var argumentLists = argumentListsFromFile(info.filename,
+                                              info.optionsFromFile);
+
+    for (var args in argumentLists) {
+      doTest(new TestCase('$suiteName/$testName',
+                          [new Command(shellPath(), args)],
+                          configuration,
+                          completeHandler,
+                          expectations,
+                          isNegative,
+                          info));
+    }
+  }
+
   Function makeTestCaseCreator(Map optionsFromFile) {
     return (String filename,
             bool isNegative,
             [bool isNegativeIfChecked = false,
              bool hasFatalTypeErrors = false,
              bool hasRuntimeErrors = false,
              Set<String> multitestOutcome = null]) {
       // Cache the test information for each test case.
       var info = new TestInformation(filename,
                                      optionsFromFile,
@@ skipping 34 matching lines @@
    * The [StandardTestSuite] has support for testing components that
    * compile a test from Dart to Javascript, and then run the resulting
    * Javascript.  This function creates a working directory to hold the
    * Javascript version of the test, and copies the appropriate framework
    * files to that directory.  It creates a [BrowserTestCase], which has
    * two sequential steps to be run by the [ProcessQueue when] the test is
    * executed: a compilation
    * step and an execution step, both with the appropriate executable and
    * arguments.
    */
-  void enqueueBrowserTest(String filename,
+  void enqueueBrowserTest(TestInformation info,
                           String testName,
-                          Map optionsFromFile,
-                          Set<String> expectations,
-                          bool isNegative) {
+                          Set<String> expectations) {
+    Map optionsFromFile = info.optionsFromFile;
+    String filename = info.filename;
     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, #source, or #resource');
     }
 
     final String component = configuration['component'];
+    Expect.isTrue(DumpRenderTreeUpdater.componentRequiresDRT(component));
     final String testPath =
         new File(filename).fullPathSync().replaceAll('\\', '/');
 
     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('-','')
@@ skipping 191 matching lines @@
       // including any intermediate directories that don't exist.
     var generatedTestPath = ['generated_tests',
                              configuration['component'],
                              testUniqueName];
 
     String tempDirPath = TestUtils.buildDir(configuration);
     if (requiresCleanTemporaryDirectory) {
       tempDirPath = globalTemporaryDirectory();
       String debugMode =
           (configuration['mode'] == 'debug') ? 'Debug_' : 'Release_';
-      generatedTestPath = ['${debugMode}_${configuration["arch"]}']
-          .addAll(generatedTestPath);
+      var temp = ['${debugMode}_${configuration["arch"]}'];
+      temp.addAll(generatedTestPath);
+      generatedTestPath = temp;
     }
     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 506 matching lines @@
       args.add('--enable_asserts');
       args.add("--enable_type_checks");
     }
     if (configuration["component"] == "leg"
         || configuration["component"] == "legium") {
       args.add("--verbose");
       args.add("--leg");
     }
     return args;
   }
+
+  static bool isBrowserComponent(String component) =>
+      const <String>['dartium',
+                     'frogium',
+                     'legium',
+                     'webdriver'].some((x) => x == component);
 }
 
 class SummaryReport {
   static int total = 0;
   static int skipped = 0;
   static int noCrash = 0;
   static int pass = 0;
   static int failOk = 0;
   static int fail = 0;
   static int crash = 0;
@@ skipping 33 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);
    }
 }