Revert "Call DumpRenderTree directly from test.dart instead of using the drt-trampoline.py indirect…

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 776 matching lines @@
    * executed: a compilation step and an execution step, both with the
    * appropriate executable and arguments. The [expectations] object can be
    * either a Set<String> if the test is a regular test, or a Map<String
    * subTestName, Set<String>> if we are running a browser multi-test (one
    * compilation and many browser runs).
    */
   void enqueueBrowserTest(TestInformation info,
                           String testName,
                           Object expectations,
                           bool isWrappingRequired) {
-    // TODO(kustermann/ricow): This method should be refactored.
     Map optionsFromFile = info.optionsFromFile;
     Path filePath = info.filePath;
     String filename = filePath.toString();
     bool isWebTest = optionsFromFile['containsDomImport'];
     bool isLibraryDefinition = optionsFromFile['isLibraryDefinition'];
     if (isWrappingRequired
         && !isLibraryDefinition && optionsFromFile['containsSourceOrImport']) {
       print('Warning for $filename: Browser tests require #library '
             'in any file that uses #import, #source, or #resource');
     }
@@ skipping 105 matching lines @@
               compiler, tempDir, vmOptions, optionsFromFile));
         }
       }
 
       // Variables for browser multi-tests.
       List<String> subtestNames = info.optionsFromFile['subtestNames'];
       TestCase multitestParentTest;
       int subtestIndex = 0;
       // Construct the command that executes the browser test
       do {
-        List<Command> commandSet = new List<Command>.from(commands);
-        if (subtestIndex != 0) {
-          // NOTE: The first time we enter this loop, all the compilation 
-          // commands will be executed. On subsequent loop iterations, we 
-          // don't need to do any compilations. Thus we set "commandSet = []".
-          commandSet = [];
-        }
-
         List<String> args = <String>[];
         String fullHtmlPath = htmlPath.startsWith('http:') ? htmlPath :
             (htmlPath.startsWith('/') ?
              'file://$htmlPath' :
              'file:///$htmlPath');
         if (info.optionsFromFile['isMultiHtmlTest']
             && subtestNames.length > 0) {
           fullHtmlPath = '${fullHtmlPath}#${subtestNames[subtestIndex]}';
         }
-
         if (TestUtils.usesWebDriver(runtime)) {
           args = [
               dartDir.append('tools/testing/run_selenium.py').toNativePath(),
               '--browser=$runtime',
               '--timeout=${configuration["timeout"] - 2}',
               '--out="$fullHtmlPath"'];
           if (runtime == 'dartium') {
             args.add('--executable=$dartiumFilename');
           }
-          if (subtestIndex != 0) {
-            args.add('--force-refresh');
+        } else {
+          args = [
+              dartDir.append('tools/testing/drt-trampoline.py').toNativePath(),
+              dumpRenderTreeFilename,
+              '--no-timeout'
+          ];
+          if (compiler == 'none') {
+            String packageRoot =
+                packageRootArgument(optionsFromFile['packageRoot']);
+            if (packageRoot != null) {
+              args.add(packageRoot);
+            }
           }
-          commandSet.add(new Command('python', args));
-        } else {
-          Expect.isTrue(runtime == "drt");
-
-          var dartFlags = [];
-          var dumpRenderTreeOptions = [];
-          var packageRootUri;
-
-          dumpRenderTreeOptions.add('--no-timeout');
-
-          if (compiler == 'none' || compiler == 'dart2dart') {
-            dartFlags.add('--ignore-unrecognized-flags');
+          if (runtime == 'drt' &&
+              (compiler == 'none' || compiler == 'dart2dart')) {
+            var dartFlags = ['--ignore-unrecognized-flags'];
             if (configuration["checked"]) {
               dartFlags.add('--enable_asserts');
               dartFlags.add("--enable_type_checks");
             }
             dartFlags.addAll(vmOptions);
+            args.add('--dart-flags=${Strings.join(dartFlags, " ")}');
           }
-          if (compiler == 'none') {
-            var packageRoot = packageRootArgument(
-                optionsFromFile['packageRoot']);
-            if (packageRoot != null) {
-              var absolutePath = TestUtils.absolutePath(new Path(packageRoot));
-              packageRootUri = new Uri.fromComponents(
-                  scheme: 'file',
-                  path: absolutePath.toString());
-            }
+          args.add(fullHtmlPath);
+          if (expectedOutput != null) {
+            args.add('--out-expectation=${expectedOutput.toNativePath()}');
           }
-
-          if (expectedOutput != null) {
-            if (expectedOutput.toNativePath().endsWith('.png')) {
-              // pixel tests are specified by running DRT "foo.html'-p"
-              dumpRenderTreeOptions.add('--notree');
-              fullHtmlPath = "${fullHtmlPath}'-p";
-            }
-          }
-          commandSet.add(new DumpRenderTreeCommand(dumpRenderTreeFilename,
-                                                   fullHtmlPath,
-                                                   dumpRenderTreeOptions,
-                                                   dartFlags,
-                                                   packageRootUri,
-                                                   expectedOutput));
         }
+        List<Command> commandSet = new List<Command>.from(commands);
+        if (subtestIndex != 0) {
+         commandSet = [];
+         if(TestUtils.usesWebDriver(runtime)) args.add('--force-refresh');
+        }
+        commandSet.add(new Command('python', args));
 
         // Create BrowserTestCase and queue it.
         String testDisplayName = '$suiteName/$testName';
         var testCase;
         if (info.optionsFromFile['isMultiHtmlTest']) {
           testDisplayName = '$testDisplayName/${subtestNames[subtestIndex]}';
           testCase = new BrowserTestCase(testDisplayName,
               commandSet, configuration, completeHandler,
               expectations['$testName/${subtestNames[subtestIndex]}'],
               info, info.hasCompileError || info.hasRuntimeError,
@@ skipping 777 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);
    }
 }