Clean up test.dart framework.

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 137 matching lines @@
 
       if (expectations.contains(SKIP)) return;
 
       var args = TestUtils.standardOptions(configuration);
       args.add(testName);
 
       doTest(new TestCase(constructedName,
                           [new Command(runnerPath, args)],
                           configuration,
                           completeHandler,
-                          expectations));
+                          expectations,
+                          usesWebDriver: false));
     }
   }
 
   void forEachTest(TestCaseEvent onTest, Map testCache, [VoidFunction onDone]) {
     doTest = onTest;
     doDone = () => (onDone != null) ? onDone() : null;
 
     var filesRead = 0;
     void statusFileRead() {
       filesRead++;
@@ skipping 281 matching lines @@
     List<List<String>> vmOptionsList = getVmOptions(info.optionsFromFile);
     Expect.isFalse(vmOptionsList.isEmpty(), "empty vmOptionsList");
 
     for (var vmOptions in vmOptionsList) {
       doTest(new TestCase('$suiteName/$testName',
                           makeCommands(info, vmOptions, commonArguments),
                           configuration,
                           completeHandler,
                           expectations,
                           isNegative: isNegative,
-                          info: info));
+                          info: info,
+                          usesWebDriver:
+                            TestUtils.usesWebDriver(configuration['runtime'])));
     }
   }
 
   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(shellPath(), args)];
@@ skipping 258 matching lines @@
         args.add(htmlPath);
         if (expectedOutput != null) {
           args.add('--out-expectation=${expectedOutput.toNativePath()}');
         }
       }
       commands.add(new Command('python', args));
 
       // Create BrowserTestCase and queue it.
       var testCase = new BrowserTestCase('$suiteName/$testName',
           commands, configuration, completeHandler, expectations,
-          info, info.hasCompileError || info.hasRuntimeError);
+          info, info.hasCompileError || info.hasRuntimeError,
+          useWebDriver: TestUtils.usesWebDriver(runtime));
       doTest(testCase);
     }
   }
 
   /** Helper to create a compilation command for a single input file. */
   Command _compileCommand(String inputFile, String outputFile,
       String compiler, String dir, var vmOptions) {
     String executable = TestUtils.compilerPath(configuration);
     List<String> args = TestUtils.standardOptions(configuration);
     switch (compiler) {
@@ skipping 451 matching lines @@
     // to run for a few minutes.
     Map updatedConfiguration = new Map();
     configuration.forEach((key, value) {
       updatedConfiguration[key] = value;
     });
     updatedConfiguration['timeout'] *= 3;
     doTest(new TestCase(suiteName,
                         [new Command('java', args)],
                         updatedConfiguration,
                         completeHandler,
-                        new Set<String>.from([PASS])));
+                        new Set<String>.from([PASS]),
+                        usesWebDriver: TestUtils.usesWebDriver(runtime)));
     doDone();
   }
 
   void completeHandler(TestCase testCase) {
   }
 
   void computeClassPath() {
     classPath = Strings.join(
         ['$buildDir/analyzer/util/analyzer/dart_analyzer.jar',
          '$buildDir/analyzer/dart_analyzer_tests.jar',
@@ skipping 253 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);
    }
 }