[cfe] Move suites from test/fasta/ to test/

Change-Id: Ida60cd9bc95c783df6e3a7819560b3836660c10f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/394486
Reviewed-by: Jens Johansen <[email protected]>

Author: johnniwinther

pkg/front_end/presubmit_helper_spawn.dart

@@ -12,7 +12,7 @@ import 'package:testing/testing.dart' as testing;
 import 'presubmit_helper.dart';
 import 'test/deps_git_test.dart' as deps_test;
 import 'test/compile_and_lint_impl.dart' show runCompileAndLintTest;
-import 'test/fasta/messages_suite.dart' as messages_suite;
+import 'test/messages_suite.dart' as messages_suite;
 import 'test/lint_suite.dart' as lint_suite;
 import 'test/spelling_test_not_src_suite.dart' as spelling_test_not_src;
 import 'test/spelling_test_src_suite.dart' as spelling_test_src;

pkg/front_end/test/async_but_no_await_git_test.dart

@@ -21,13 +21,11 @@ import 'package:kernel/target/changed_structure_notifier.dart';
 import 'package:kernel/target/targets.dart';
 import "package:vm/modular/target/vm.dart" show VmTarget;
 
-import 'testing_utils.dart' show getGitFiles;
+import 'testing_utils.dart' show computeSourceFiles;
 import "utils/io_utils.dart";
 
 final Uri repoDir = computeRepoDirUri();
 
-Set<Uri> libUris = {};
-
 Future<void> main(List<String> args) async {
   api.CompilerOptions compilerOptions = getOptions();
 
@@ -39,22 +37,7 @@ Future<void> main(List<String> args) async {
 
   ProcessedOptions options = new ProcessedOptions(options: compilerOptions);
 
-  libUris.add(repoDir.resolve("pkg/front_end/lib/"));
-  libUris.add(repoDir.resolve("pkg/front_end/test/fasta/"));
-  libUris.add(repoDir.resolve("pkg/front_end/tool/"));
-
-  for (Uri uri in libUris) {
-    Set<Uri> gitFiles = await getGitFiles(uri);
-    List<FileSystemEntity> entities =
-        new Directory.fromUri(uri).listSync(recursive: true);
-    for (FileSystemEntity entity in entities) {
-      if (entity is File &&
-          entity.path.endsWith(".dart") &&
-          gitFiles.contains(entity.uri)) {
-        options.inputs.add(entity.uri);
-      }
-    }
-  }
+  options.inputs.addAll(await computeSourceFiles(repoDir));
 
   Stopwatch stopwatch = new Stopwatch()..start();
 

pkg/front_end/test/binary_md_git_test.dart

@@ -7,7 +7,7 @@ import 'dart:io' show File;
 import 'binary_md_dill_reader.dart' show BinaryMdDillReader;
 import 'utils/io_utils.dart' show computeRepoDir;
 
-Future<void> main() async {
+void main() {
   File binaryMd = new File("$repoDir/pkg/kernel/binary.md");
   String binaryMdContent = binaryMd.readAsStringSync();
 

pkg/front_end/test/coverage_suite.dart

@@ -50,7 +50,7 @@ Future<void> _run(Directory coverageTmpDir, List<String> arguments) async {
     futures.add(Process.run(Platform.resolvedExecutable, [
       "--enable-asserts",
       "--deterministic",
-      "pkg/front_end/test/fasta/strong_suite.dart",
+      "pkg/front_end/test/strong_suite.dart",
       "-DskipVm=true",
       "--shards=${options.numberOfWorkers}",
       "--shard=${i + 1}",

pkg/front_end/test/dartdoctest_suite.dart

@@ -6,16 +6,16 @@ import 'package:testing/testing.dart'
     show Chain, ChainContext, Result, Step, TestDescription;
 
 import '../tool/dart_doctest_impl.dart';
-import 'fasta/suite_utils.dart';
+import 'utils/suite_utils.dart';
 
 void main([List<String> arguments = const []]) => internalMain(createContext,
     arguments: arguments,
     displayName: "dartdoctest suite",
     configurationPath: "../testing.json");
 
 Future<Context> createContext(
-    Chain suite, Map<String, String> environment) async {
-  return new Context(suite.name);
+    Chain suite, Map<String, String> environment) {
+  return new Future.value(new Context(suite.name));
 }
 
 class Context extends ChainContext {

pkg/front_end/test/desugar_test.dart

@@ -45,13 +45,14 @@ Future<void> testRedirectingFactorySerialized() async {
 
 // regression test: redirecting factories from patch files don't have the
 // redirecting-factory flag stored in kernel.
-Future<void> testRedirectingFactoryPatchFile() async {
+Future<void> testRedirectingFactoryPatchFile() {
   var componentUri =
       computePlatformBinariesLocation().resolve('dart2js_platform.dill');
   var component = new ir.Component();
   new BinaryBuilder(new File.fromUri(componentUri).readAsBytesSync())
       .readComponent(component);
   checkIsRedirectingFactory(component, 'collection', 'HashMap', 'identity');
+  return new Future.value();
 }
 
 void checkIsRedirectingFactory(ir.Component component, String uriPath,

pkg/front_end/test/fasta/expression_suite.dart renamed to pkg/front_end/test/expression_suite.dart

@@ -51,10 +51,10 @@ import "package:testing/testing.dart"
 import 'package:vm/modular/target/vm.dart' show VmTarget;
 import "package:yaml/yaml.dart" show YamlMap, YamlList, loadYamlNode;
 
-import '../testing_utils.dart' show checkEnvironment;
-import '../utils/kernel_chain.dart' show runDiff, openWrite;
-import 'suite_utils.dart';
-import '../testing/environment_keys.dart';
+import 'testing_utils.dart' show checkEnvironment;
+import 'utils/kernel_chain.dart' show runDiff, openWrite;
+import 'utils/suite_utils.dart';
+import 'testing/environment_keys.dart';
 
 class Context extends ChainContext {
   final CompilerContext compilerContext;
@@ -740,4 +740,5 @@ void main([List<String> arguments = const []]) => internalMain(
       createContext,
       arguments: arguments,
       displayName: "expression suite",
+      configurationPath: "../testing.json",
     );

pkg/front_end/test/hot_reload_e2e_test.dart

@@ -69,9 +69,10 @@ abstract class TestCase {
     await rebuild(compiler, outputUri); // this is a full compile.
   }
 
-  Future<void> tearDown() async {
+  Future<void> tearDown() {
     outDir.deleteSync(recursive: true);
     lines = const [];
+    return new Future.value();
   }
 
   Future<int> computeVmPort() async {

pkg/front_end/test/incremental_bulk_compiler_full.dart

@@ -21,8 +21,8 @@ void main([List<String> arguments = const []]) =>
     runMe(arguments, createContext, configurationPath: "../testing.json");
 
 Future<Context> createContext(
-    Chain suite, Map<String, String> environment) async {
-  return new Context();
+    Chain suite, Map<String, String> environment) {
+  return new Future.value(new Context());
 }
 
 class Context extends ChainContext {

pkg/front_end/test/incremental_bulk_compiler_smoke_suite.dart

@@ -4,7 +4,7 @@
 
 import 'package:testing/testing.dart' show Chain;
 
-import 'fasta/suite_utils.dart';
+import 'utils/suite_utils.dart';
 import 'incremental_bulk_compiler_full.dart' show Context;
 
 void main([List<String> arguments = const []]) => internalMain(createContext,
@@ -13,6 +13,6 @@ void main([List<String> arguments = const []]) => internalMain(createContext,
     configurationPath: "../testing.json");
 
 Future<Context> createContext(
-    Chain suite, Map<String, String> environment) async {
-  return new Context();
+    Chain suite, Map<String, String> environment) {
+  return new Future.value(new Context());
 }