Remove Dartium support from test.dart.

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.
  */
 import 'dart:async';
 import 'dart:io';
 
 import 'browser_test.dart';
 import 'command.dart';
 import 'compiler_configuration.dart';
 import 'configuration.dart';
-import 'drt_updater.dart';
 import 'expectation.dart';
 import 'expectation_set.dart';
 import 'html_test.dart' as html_test;
 import 'http_server.dart';
 import 'multitest.dart';
 import 'path.dart';
+import 'runtime_updater.dart';
 import 'summary_report.dart';
 import 'test_configurations.dart';
 import 'test_runner.dart';
 import 'utils.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+:(.*)");
@@ skipping 600 matching lines @@
     return filename.endsWith("Test.dart");
   }
 
   bool isHtmlTestFile(String filename) => filename.endsWith('_htmltest.html');
 
   List<String> additionalOptions(Path filePath) => [];
 
   Future forEachTest(
       Function onTest, Map<String, List<TestInformation>> testCache,
       [VoidFunction onDone]) async {
-    await updateDartium();
+    if (!configuration.listTests) {
+      await updateContentShell(configuration.runtime, configuration.drtPath);
+    }
+
     doTest = onTest;
     testExpectations = readExpectations();
 
     // Check if we have already found and generated the tests for this suite.
     if (!testCache.containsKey(suiteName)) {
       cachedTests = testCache[suiteName] = <TestInformation>[];
       await enqueueTests();
     } else {
       for (var info in testCache[suiteName]) {
         enqueueTestCaseFromTestInformation(info);
       }
     }
     testExpectations = null;
     cachedTests = null;
     doTest = null;
     if (onDone != null) onDone();
   }
 
   /**
-   * If Content shell/Dartium is required, and not yet updated, waits for
-   * the update then completes. Otherwise completes immediately.
-   */
-  Future updateDartium() {
-    var completer = new Completer();
-    var updater = runtimeUpdater(configuration.runtime, configuration.drtPath,
-        configuration.dartiumPath);
-    if (updater == null || updater.updated) {
-      return new Future.value(null);
-    }
-
-    assert(updater.isActive);
-    updater.onUpdated.add(() => completer.complete(null));
-
-    return completer.future;
-  }
-
-  /**
    * Reads the status files and completes with the parsed expectations.
    */
   ExpectationSet readExpectations() {
     var statusFiles = statusFilePaths.where((String statusFilePath) {
       var file = new File(dartDir.append(statusFilePath).toNativePath());
       return file.existsSync();
     }).map((statusFilePath) {
       return dartDir.append(statusFilePath).toNativePath();
     }).toList();
 
@@ skipping 326 matching lines @@
   }
 
   void _enqueueBrowserTestWithOptions(
       Path packageRoot,
       Path packages,
       TestInformation info,
       String testName,
       Map<String, Set<Expectation>> expectations,
       List<String> vmOptions,
       String tempDir) {
-    // TODO(Issue 14651): If we're on dartium, we need to pass [packageRoot]
-    // on to the browser (it may be test specific).
     var filePath = info.filePath;
     var fileName = filePath.toNativePath();
 
     var optionsFromFile = info.optionsFromFile;
     var compilationTempDir = createCompilationOutputDirectory(info.filePath);
     var dartWrapperFilename = '$tempDir/test.dart';
     var compiledDartWrapperFilename = '$compilationTempDir/test.js';
     var dir = filePath.directoryPath;
     var nameNoExt = filePath.filenameWithoutExtension;
     var customHtmlPath = dir.append('$nameNoExt.html').toNativePath();
@@ skipping 19 matching lines @@
         compiledDartWrapperFilename = '$tempDir/$nameNoExt.js';
         htmlContents = htmlContents.replaceAll(
             '%TEST_SCRIPTS%', '<script src="$nameNoExt.js"></script>');
       }
       new File(htmlPath).writeAsStringSync(htmlContents);
     } else {
       htmlPath = '$tempDir/test.html';
       if (configuration.compiler != Compiler.dart2js &&
           configuration.compiler != Compiler.dartdevc) {
         // test.dart will import the dart test.
         _createWrapperFile(dartWrapperFilename, filePath);

[Bill Hesse, 2017/07/19 14:13:06]

This should be dead code, and removed.  We don't support browser tests with
compiler == none.

[Bob Nystrom, 2017/07/20 00:00:01]

Done.

       } else {
         dartWrapperFilename = fileName;
       }
 
       // Create the HTML file for the test.
       var scriptPath = dartWrapperFilename;
       if (configuration.compiler != Compiler.none) {

[Bill Hesse, 2017/07/19 14:13:07]

This should always be true

[Bob Nystrom, 2017/07/20 00:00:01]

Done.

         scriptPath = compiledDartWrapperFilename;
       }
       scriptPath = _createUrlPathFromFile(new Path(scriptPath));
 
       if (configuration.compiler != Compiler.dartdevc) {
         content = getHtmlContents(fileName, scriptType, scriptPath);

[Bill Hesse, 2017/07/19 14:13:06]

scriptType is always 'text/javascript'

[Bob Nystrom, 2017/07/20 00:00:01]

Done.

       } else {
         var jsDir = new Path(compilationTempDir)
             .relativeTo(TestUtils.dartDir)
             .toString();
         content = dartdevcHtml(nameNoExt, jsDir, buildDir);
       }
 
       new File(htmlPath).writeAsStringSync(content);
     }
 
     // Construct the command(s) that compile all the inputs needed by the
     // browser test. For running Dart in DRT, this will be noop commands.
     var commands = <Command>[];
 
     switch (configuration.compiler) {
       case Compiler.dart2js:
         commands.add(_dart2jsCompileCommand(dartWrapperFilename,
             compiledDartWrapperFilename, tempDir, optionsFromFile));
         break;
 
       case Compiler.dartdevc:
-        var toPath = new Path('$compilationTempDir/$nameNoExt.js')
-            .toNativePath();
-        commands.add(configuration.compilerConfiguration.createCommand(
-            dartWrapperFilename, toPath));
+        var toPath =
+            new Path('$compilationTempDir/$nameNoExt.js').toNativePath();
+        commands.add(configuration.compilerConfiguration
+            .createCommand(dartWrapperFilename, toPath));
         break;
 
       case Compiler.none:
         break;

[Bill Hesse, 2017/07/19 14:13:07]

Remove this case.

[Bob Nystrom, 2017/07/20 00:00:00]

Done.

 
       default:
         assert(false);
     }
 
     // Some tests require compiling multiple input scripts.
     for (var name in optionsFromFile['otherScripts'] as List<String>) {
       var namePath = new Path(name);
       var fromPath = filePath.directoryPath.join(namePath);
       var toPath = new Path('$tempDir/${namePath.filename}.js').toNativePath();
 
       switch (configuration.compiler) {
         case Compiler.dart2js:
-          commands.add(_dart2jsCompileCommand(fromPath.toNativePath(),
-              toPath, tempDir, optionsFromFile));
+          commands.add(_dart2jsCompileCommand(
+              fromPath.toNativePath(), toPath, tempDir, optionsFromFile));
           break;
 
         case Compiler.dartdevc:
-          commands.add(configuration.compilerConfiguration.createCommand(
-              fromPath.toNativePath(), toPath));
+          commands.add(configuration.compilerConfiguration
+              .createCommand(fromPath.toNativePath(), toPath));
           break;
 
         default:

[Bill Hesse, 2017/07/19 14:13:06]

Remove.

[Bob Nystrom, 2017/07/20 00:00:01]

Done.

           assert(configuration.compiler == Compiler.none);
       }
 
       if (configuration.compiler == Compiler.none) {

[Bill Hesse, 2017/07/19 14:13:07]

Remove.

[Bob Nystrom, 2017/07/20 00:00:01]

Done.

         // 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.
         new File(fromPath.toNativePath())
             .copySync('$tempDir/${namePath.filename}');
       }
     }
 
     if (info.optionsFromFile['isMultiHtmlTest'] as bool) {
       // Variables for browser multi-tests.
@@ skipping 32 matching lines @@
       // Chrome may send a termination signal to a test.  The test will be
       // terminated if a machine (bot) doesn't have a GPU or if a test is
       // still running after a certain period of time.
       if (configuration.system == System.linux &&
           configuration.runtime == Runtime.drt) {
         contentShellOptions.add('--disable-gpu');
         // TODO(terry): Roll 50 need this in conjection with disable-gpu.
         contentShellOptions.add('--disable-gpu-early-init');
       }
 
       if (configuration.compiler == Compiler.none) {

[Bill Hesse, 2017/07/19 14:13:07]

Remove.

[Bob Nystrom, 2017/07/20 00:00:00]

Done.

         dartFlags.add('--ignore-unrecognized-flags');
         if (configuration.isChecked) {
           dartFlags.add('--enable_asserts');
           dartFlags.add("--enable_type_checks");
         }
         dartFlags.addAll(vmOptions);
       }
 
       commands.add(Command.contentShell(contentShellFilename, fullHtmlPath,
           contentShellOptions, dartFlags, environmentOverrides));
     } else {
       commands.add(Command.browserTest(fullHtmlPath, configuration,
           retry: !isNegative(info)));
     }
 
     // Create BrowserTestCase and queue it.
     var expectation = expectations[testName];
     var testCase = new BrowserTestCase('$suiteName/$testName', commands,
         configuration, expectation, info, isNegative(info), fullHtmlPath);
 
     enqueueNewTestCase(testCase);
   }
 
   void _enqueueHtmlTest(HtmlTestInformation info, String testName,

[Bill Hesse, 2017/07/19 14:13:06]

Ignore this function, since we think we want to remove these (the _html.test
tests) anyway.

[Bob Nystrom, 2017/07/20 00:00:01]

What do you mean by "ignore"? I think we do still want to support this for
dart2js, at least for now. Do you mean I can just leave it as-is?

       Set<Expectation> expectations) {
     var compiler = configuration.compiler;
     var runtime = configuration.runtime;
 
     if (compiler == Compiler.dartdevc) {
       // TODO(rnystrom): Support this for dartdevc (#29919).
       print("Ignoring $testName on dartdevc since HTML tests are not "
           "implemented for that compiler yet.");
       return;
     }
@@ skipping 87 matching lines @@
     args.add(inputFile);
 
     var options = optionsFromFile['sharedOptions'] as List<String>;
     if (options != null) args.addAll(options);
 
     return Command.compilation(Compiler.dart2js.name, outputFile,
         dart2JsBootstrapDependencies, compilerPath, args, environmentOverrides,
         alwaysCompile: !useSdk);
   }
 
   String get scriptType {

[Bill Hesse, 2017/07/19 14:13:07]

This function can be replaced with 'text/javascript', and places using it can be
simplified.

[Bob Nystrom, 2017/07/20 00:00:01]

Done.

     switch (configuration.compiler) {
       case Compiler.none:
         return 'application/dart';
       case Compiler.dart2js:
       case Compiler.dart2analyzer:
       case Compiler.dartdevc:
         return 'text/javascript';
       default:
         print('Non-web runtime, so no scriptType for: '
             '${configuration.compiler.name}');
@@ skipping 58 matching lines @@
       return null;
     }
   }
 
   /**
    * Special options for individual tests are currently specified in various
    * ways: with comments directly in test files, by using certain imports, or by
    * creating additional files in the test directories.
    *
    * Here is a list of options that are used by 'test.dart' today:
-   *   - Flags can be passed to the vm or dartium process that runs the test by
-   *   adding a comment to the test file:
+   *   - Flags can be passed to the vm process that runs the test by adding a
+   *   comment to the test file:
    *
    *     // VMOptions=--flag1 --flag2
    *
    *   - Flags can be passed to dart2js or vm by adding a comment
    *   to the test file:
    *
    *     // SharedOptions=--flag1 --flag2
    *
    *   - Flags can be passed to the dart script that contains the test also
    *   using comments, as follows:
@@ skipping 223 matching lines @@
       Compiler.dartkp,
       Compiler.precompiler,
       Compiler.appJit
     ];
 
     const runtimes = const [
       Runtime.none,
       Runtime.dartPrecompiled,
       Runtime.vm,
       Runtime.drt,
-      Runtime.dartium,
-      Runtime.contentShellOnAndroid,
-      Runtime.dartiumOnAndroid
+      Runtime.contentShellOnAndroid
     ];
 
     var needsVmOptions = compilers.contains(configuration.compiler) &&
         runtimes.contains(configuration.runtime);
     if (!needsVmOptions) return [[]];
     return optionsFromFile['vmOptions'] as List<List<String>>;
   }
 
   /**
    * Read options from a co19 test file.
@@ skipping 68 matching lines @@
           testDisplayName,
           commands,
           configuration,
           expectations as Set<Expectation>,
           info,
           isNegative(info),
           relativeHtml.toNativePath()));
     }
   }
 }
 

[Bill Hesse, 2017/07/19 14:13:06]

I think everything after this is dead code.  There is no dartc anymore.  No code
refers to these classes.

[Bob Nystrom, 2017/07/20 00:00:01]

I believe AnalyzeLibraryTestSuite is still used for the "analyze_library"
selector, and it uses DartcCompilationTestSuite as its base class. The two
classes should be merged. Added a TODO.

 /// A DartcCompilationTestSuite will run dartc on all of the tests.
 ///
 /// Usually, the result of a dartc run is determined by the output of
 /// dartc in connection with annotations in the test file.
 class DartcCompilationTestSuite extends StandardTestSuite {
   List<String> _testDirs;
 
   DartcCompilationTestSuite(
       Configuration configuration,
       String suiteName,
@@ skipping 36 matching lines @@
 
   bool isTestFile(String filename) {
     // NOTE: We exclude tests and patch files for now.
     return filename.endsWith(".dart") &&
         !filename.endsWith("_test.dart") &&
         !filename.contains("_internal/js_runtime/lib");
   }
 
   bool get listRecursively => true;
 }