Enable dart2js compilation for new HTML tests.

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 21 matching lines @@
     RuntimeConfiguration;
 
 part "browser_test.dart";
 
 
 RegExp multiHtmlTestGroupRegExp = new RegExp(r"\s*[^/]\s*group\('[^,']*");
 RegExp multiHtmlTestRegExp = new RegExp(r"useHtmlIndividualConfiguration()");
 // Require at least one non-space character before '///'
 RegExp multiTestRegExp = new RegExp(r"\S *"
                                     r"/// \w+:(.*)");
+RegExp dartExtension = new RegExp(r'\.dart$');
 
 /**
  * A simple function that tests [arg] and returns `true` or `false`.
  */
 typedef bool Predicate<T>(T arg);
 
 typedef void CreateTest(Path filePath,
                         Path originTestPath,
                         bool hasCompileError,
                         bool hasRuntimeError,
@@ skipping 1222 matching lines @@
       htmlTest.closeSync();
     }
 
     if (compiler != 'none') {
       commands.add(
           _compileCommand(
               dartWrapperFilename,
               compiledDartWrapperFilename,
               compiler,
               tempDir,
-              vmOptions,
               optionsFromFile));
     }
 
     // some tests require compiling multiple input scripts.
     List<String> otherScripts = optionsFromFile['otherScripts'];
     for (String name in otherScripts) {
       Path namePath = new Path(name);
       String fileName = namePath.filename;
       Path fromPath = filePath.directoryPath.join(namePath);
       if (compiler != 'none') {
         assert(namePath.extension == 'dart');
         commands.add(
             _compileCommand(
                 fromPath.toNativePath(),
                 '$tempDir/$fileName.js',
                 compiler,
                 tempDir,
-                vmOptions,
                 optionsFromFile));
       }
       if (compiler == 'none') {
         // For the tests that require multiple input scripts but are not
         // compiled, move the input scripts over with the script so they can
         // be accessed.
         String result = new File(fromPath.toNativePath()).readAsStringSync();
         new File('$tempDir/$fileName').writeAsStringSync(result);
       }
     }
@@ skipping 63 matching lines @@
   void enqueueHtmlTest(
       HtmlTestInformation info,
       String testName,
       expectations) {
     final String compiler = configuration['compiler'];
     final String runtime = configuration['runtime'];
     // Html tests work only with the browser controller.
     if (!TestUtils.isBrowserRuntime(runtime) || runtime == 'drt') {
       return;
     }
+    bool compileToJS = (compiler == 'dart2js');
 
     final Path filePath = info.filePath;
     final String tempDir = createOutputDirectory(filePath, '');
     final Uri tempUri = new Uri.file('$tempDir/');
-    String contents = htmlTest.getContents(info);
+    String contents = htmlTest.getContents(info, compileToJS);
+    final commands = [];
 
     void Fail(String message) {
       var msg = "$message: ${info.filePath}";
       DebugLogger.warning(msg);
       contents = htmlTest.makeFailingHtmlFile(msg);
     }
 
     if (info.scripts.length > 0) {
       Uri testUri = new Uri.file(filePath.toNativePath());
       for (String scriptPath in info.scripts) {
         if (!scriptPath.endsWith('.dart') && !scriptPath.endsWith('.js')) {
           Fail('HTML test scripts must be dart or javascript: $scriptPath');
           break;
         }
         Uri uri = Uri.parse(scriptPath);
         if (uri.isAbsolute) {
           Fail('HTML test scripts must have relative paths: $scriptPath');
           break;
         }
         if (uri.pathSegments.length > 1) {
           Fail('HTML test scripts must be in test directory: $scriptPath');
           break;
         }
         Uri script = testUri.resolveUri(uri);
+        Uri copiedScript = tempUri.resolveUri(uri);
         if (compiler == 'none' || scriptPath.endsWith('.js')) {
-          Uri copiedScript = tempUri.resolveUri(uri);
           new File.fromUri(copiedScript).writeAsStringSync(
               new File.fromUri(script).readAsStringSync());
         } else {
-          // TODO(21514): Compile scripts into output directory.
-          Fail('HTML test scripts don\'t support dart2js yet');
-          break;
+          commands.add(_compileCommand(
+              script.toFilePath(),
+              copiedScript.toFilePath().replaceFirst(dartExtension, '.js'),
+              compiler,
+              tempDir,
+              info.optionsFromFile));
         }
       }
     }
     final Uri htmlFile = tempUri.resolve(filePath.filename);
     new File.fromUri(htmlFile).writeAsStringSync(contents);
 
     var htmlPath = _createUrlPathFromFile(new Path(htmlFile.toFilePath()));
     var fullHtmlPath = _getUriForBrowserTest(htmlPath, null).toString();
-    var commands = [
-        CommandBuilder.instance.getBrowserHtmlTestCommand(
-            runtime,
-            fullHtmlPath,
-            configuration,
-            info.expectedMessages)];
+    commands.add(CommandBuilder.instance.getBrowserHtmlTestCommand(
+        runtime,
+        fullHtmlPath,
+        configuration,
+        info.expectedMessages));
     String testDisplayName = '$suiteName/$testName';
     var testCase = new BrowserTestCase(
         testDisplayName,
         commands,
         configuration,
         expectations,
         info,
         isNegative(info),
         fullHtmlPath);
     enqueueNewTestCase(testCase);
     return;
   }
 
   /** Helper to create a compilation command for a single input file. */
   Command _compileCommand(String inputFile, String outputFile,
-      String compiler, String dir, vmOptions, optionsFromFile) {
+      String compiler, String dir, optionsFromFile) {
     assert (['dart2js', 'dart2dart'].contains(compiler));
-    String executable = compilerPath;
-    List<String> args = TestUtils.standardOptions(configuration);
+    String executable;
+    List<String> args;
+    if (compilerPath.endsWith('.dart')) {
+      // Run the compiler script via the Dart VM.
+      executable = dartVmBinaryFileName;
+      args = [compilerPath];
+    } else {
+      executable = compilerPath;
+      args = [];
+    }
+    args.addAll(TestUtils.standardOptions(configuration));
     String packageRoot =
       packageRootArgument(optionsFromFile['packageRoot']);
-    if (packageRoot != null) {
-      args.add(packageRoot);
-    }
+    if (packageRoot != null) args.add(packageRoot);
     args.add('--out=$outputFile');
     if (configuration['csp']) args.add('--csp');
     args.add(inputFile);
-    args.addAll(optionsFromFile['sharedOptions']);
-    if (executable.endsWith('.dart')) {
-      // Run the compiler script via the Dart VM.
-      args.insert(0, executable);
-      executable = dartVmBinaryFileName;
-    }
+    List<String> options = optionsFromFile['sharedOptions'];
+    if (options != null) args.addAll(options);
     return CommandBuilder.instance.getCompilationCommand(
         compiler, outputFile, !useSdk,
         dart2JsBootstrapDependencies, compilerPath, args, environmentOverrides);
   }
 
   /** Helper to create a Polymer deploy command for a single HTML file. */
   Command _polymerDeployCommand(String inputFile, String outputDir,
       optionsFromFile) {
     List<String> args = [];
     String packageRoot = packageRootArgument(optionsFromFile['packageRoot']);
@@ skipping 996 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);
   }
 }