Revert "Revert "Revert "Refactor test option parsing code."""

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 456 matching lines @@
 
   void testNameHandler(ExpectationSet testExpectations, String testName) {
     // Only run the tests that match the pattern. Use the name
     // "suiteName/testName" for cc tests.
     String constructedName = '$suiteName/$testPrefix$testName';
 
     var expectations = testExpectations.expectations('$testPrefix$testName');
 
     var args = TestUtils.standardOptions(configuration);
     var compilerConfiguration = new CompilerConfiguration(configuration);
-    if (compilerConfiguration.useDfe) {
+    if (compilerConfiguration.useDFE) {
       args.add('--use-dart-frontend');
       // '--dfe' has to be the first argument for run_vm_test to pick it up.
       args.insert(0, '--dfe=$buildDir/gen/kernel-service.dart.snapshot');
     }
     args.add(testName);
 
     var command = CommandBuilder.instance.getProcessCommand(
         'run_vm_unittest', targetRunnerPath, args, environmentOverrides);
     enqueueNewTestCase(
         new TestCase(constructedName, [command], configuration, expectations));
@@ skipping 1533 matching lines @@
         args.add("--allow-mock-compilation");
         args.add("--categories=all");
       }
     }
     if ((compiler == "dart2js") && configuration["minified"]) {
       args.add("--minify");
     }
     if (compiler == "dart2js" && configuration["csp"]) {
       args.add("--csp");
     }
+    if (compiler == "dart2js" && configuration["cps_ir"]) {
+      args.add("--use-cps-ir");
+    }
     if (compiler == "dart2js" && configuration["fast_startup"]) {
       args.add("--fast-startup");
     }
     if (compiler == "dart2js" && configuration["dart2js_with_kernel"]) {
       args.add("--use-kernel");
     }
     return args;
   }
 
   static bool isBrowserRuntime(String runtime) {
@@ skipping 182 matching lines @@
       }
       if (path.length > WINDOWS_SHORTEN_PATH_LIMIT) {
         ++shortNameCounter;
         var pathEnd = path.substring(path.length - WINDOWS_PATH_END_LENGTH);
         path = "short${shortNameCounter}_$pathEnd";
       }
     }
     return path;
   }
 }