extend const_finder_test to compile web dills

tools/const_finder/lib/const_finder.dart

@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'dart:collection';
-import 'dart:io' as io;
 
 import 'package:kernel/kernel.dart';
 
@@ -113,10 +112,6 @@ class _ConstVisitor extends RecursiveVisitor<void> {
   }
 }
 
-void _printStackTrace(Node node) {
-  io.stderr.writeln(StackTrace.current);
-}
-
 /// For debugging.
 Library? lastLibrary;
 
@@ -150,7 +145,7 @@ class ConstFinder {
     return <String, dynamic>{
       'constantInstances': _visitor.constantInstances,
       'nonConstantLocations': _visitor.nonConstantLocations,
-      'skippedConstantInstances': _visitor.skippedConstantInstances,
+      //'skippedConstantInstances': _visitor.skippedConstantInstances,
     };
   }
 }

tools/const_finder/test/const_finder_test.dart

@@ -35,37 +35,26 @@ void expectInstances(dynamic value, dynamic expected) {
   }
 }
 
-final String basePath =
-    path.canonicalize(path.join(path.dirname(Platform.script.toFilePath()), '..'));
-final String fixtures = path.join(basePath, 'test', 'fixtures');
-final String box = path.join(fixtures, 'lib', 'box.dart');
-final String consts = path.join(fixtures, 'lib', 'consts.dart');
-final String packageConfig = path.join(fixtures, '.dart_tool', 'package_config.json');
-final String constsAndNon = path.join(fixtures, 'lib', 'consts_and_non.dart');
-final String boxDill = path.join(fixtures, 'box.dill');
-final String constsDill = path.join(fixtures, 'consts.dill');
-final String constsAndNonDill = path.join(fixtures, 'consts_and_non.dill');
-
 // This test is assuming the `dart` used to invoke the tests is compatible
 // with the version of package:kernel in //third-party/dart/pkg/kernel
 final String dart = Platform.resolvedExecutable;
 final String bat = Platform.isWindows ? '.bat' : '';
 
-void _checkRecursion() {
+void _checkRecursion(String dillPath) {
   stdout.writeln('Checking recursive calls.');
   final ConstFinder finder = ConstFinder(
-    kernelFilePath: boxDill,
+    kernelFilePath: dillPath,
     classLibraryUri: 'package:const_finder_fixtures/box.dart',
     className: 'Box',
   );
   // Will timeout if we did things wrong.
   jsonEncode(finder.findInstances());
 }
 
-void _checkConsts() {
+void _checkConsts(String dillPath) {
   stdout.writeln('Checking for expected constants.');
   final ConstFinder finder = ConstFinder(
-    kernelFilePath: constsDill,
+    kernelFilePath: dillPath,
     classLibraryUri: 'package:const_finder_fixtures/target.dart',
     className: 'Target',
   );
@@ -99,7 +88,7 @@ void _checkConsts() {
   );
 
   final ConstFinder finder2 = ConstFinder(
-    kernelFilePath: constsDill,
+    kernelFilePath: dillPath,
     classLibraryUri: 'package:const_finder_fixtures/target.dart',
     className: 'MixedInTarget',
   );
@@ -114,10 +103,10 @@ void _checkConsts() {
   );
 }
 
-void _checkNonConsts() {
+void _checkNonConsts(String dillPath) {
   stdout.writeln('Checking for non-constant instances.');
   final ConstFinder finder = ConstFinder(
-    kernelFilePath: constsAndNonDill,
+    kernelFilePath: dillPath,
     classLibraryUri: 'package:const_finder_fixtures/target.dart',
     className: 'Target',
   );
@@ -168,68 +157,168 @@ void _checkNonConsts() {
   );
 }
 
+void checkProcessResult(ProcessResult result) {
+  if (result.exitCode != 0) {
+    stdout.writeln(result.stdout);
+    stderr.writeln(result.stderr);
+  }
+  expect(result.exitCode, 0);
+}
+
 Future<void> main(List<String> args) async {
-  if (args.length != 2) {
-    stderr.writeln('The first argument must be the path to the forntend server dill.');
+  if (args.length != 3) {
+    stderr.writeln('The first argument must be the path to the frontend server dill.');
     stderr.writeln('The second argument must be the path to the flutter_patched_sdk');
+    stderr.writeln('The third argument must be the path to libraries.json');
     exit(-1);
   }
-  final String frontendServer = args[0];
-  final String sdkRoot = args[1];
-  try {
-    void checkProcessResult(ProcessResult result) {
-      if (result.exitCode != 0) {
-        stdout.writeln(result.stdout);
-        stderr.writeln(result.stderr);
+
+  TestRunner(
+    frontendServer: args[0],
+    sdkRoot: args[1],
+    librariesSpec: args[2],
+  ).test();
+}
+
+final String basePath =
+    path.canonicalize(path.join(path.dirname(Platform.script.toFilePath()), '..'));
+final String fixtures = path.join(basePath, 'test', 'fixtures');
+final String packageConfig = path.join(fixtures, '.dart_tool', 'package_config.json');
+
+class TestRunner {
+  TestRunner({
+    required this.frontendServer,
+    required this.sdkRoot,
+    required this.librariesSpec,
+  });
+
+  //static final String box = path.join(fixtures, 'lib', 'box.dart');
+  //static final String consts = path.join(fixtures, 'lib', 'consts.dart');
+  //static final String constsAndNon = path.join(fixtures, 'lib', 'consts_and_non.dart');
+
+  final String frontendServer;
+  final String sdkRoot;
+  final String librariesSpec;
+
+  void test() {
+    final List<_Test> tests = <_Test>[
+      _Test(
+        name: 'box',
+        dartSource: path.join(fixtures, 'lib', 'box.dart'),
+        frontendServer: frontendServer,
+        sdkRoot: sdkRoot,
+        librariesSpec: librariesSpec,
+        verify: _checkRecursion,
+      ),
+      _Test(
+        name: 'consts',
+        dartSource: path.join(fixtures, 'lib', 'consts.dart'),
+        frontendServer: frontendServer,
+        sdkRoot: sdkRoot,
+        librariesSpec: librariesSpec,
+        verify: _checkConsts,
+      ),
+      _Test(
+        name: 'consts_and_non',
+        dartSource: path.join(fixtures, 'lib', 'consts_and_non.dart'),
+        frontendServer: frontendServer,
+        sdkRoot: sdkRoot,
+        librariesSpec: librariesSpec,
+        verify: _checkNonConsts,
+      ),
+    ];
+    try {
+      stdout.writeln('Generating kernel fixtures...');
+
+      for (final _Test test in tests) {
+        test.run();
+      }
+    } finally {
+      try {
+        for (final _Test test in tests) {
+          test.dispose();
+        }
+      } finally {
+        stdout.writeln('Tests ${exitCode == 0 ? 'succeeded' : 'failed'} - exit code: $exitCode');
       }
-      expect(result.exitCode, 0);
     }
+  }
 
-    stdout.writeln('Generating kernel fixtures...');
-    stdout.writeln(consts);
+}
 
-    checkProcessResult(Process.runSync(dart, <String>[
-      frontendServer,
-      '--sdk-root=$sdkRoot',
-      '--target=flutter',
-      '--aot',
-      '--tfa',
-      '--packages=$packageConfig',
-      '--output-dill=$boxDill',
-      box,
-    ]));
+class _Test {
+  _Test({
+    required this.name,
+    required this.dartSource,
+    required this.sdkRoot,
+    required this.verify,
+    required this.frontendServer,
+    required this.librariesSpec,
+  });
 
+  final String name;
+  final String dartSource;
+  final String sdkRoot;
+  final String frontendServer;
+  final String librariesSpec;
+  void Function(String dillPath) verify;
+
+  final List<String> resourcesToDispose = <String>[];
+
+  void run() {
+    final String tfaDill = path.join(fixtures, '$name-tfa.dill');
+    stdout.writeln('Compiling $dartSource to $tfaDill');
+    _compileTFADill(tfaDill);
+    stdout.writeln('Testing $tfaDill');
+    verify(tfaDill);
+
+    final String webDill = path.join(fixtures, '$name-web.dill');
+    stdout.writeln('Compiling $dartSource to $webDill');
+    _compileWebDill(webDill, dartSource);
+    verify(webDill);
+    stdout.writeln('Testing $webDill');
+  }
+
+  void dispose() {
+    for (final String resource in resourcesToDispose) {
+      stdout.writeln('Deleting $resource');
+      File(resource).deleteSync();
+    }
+  }
+
+  void _compileTFADill(String dillPath) {
     checkProcessResult(Process.runSync(dart, <String>[
       frontendServer,
       '--sdk-root=$sdkRoot',
       '--target=flutter',
       '--aot',
       '--tfa',
       '--packages=$packageConfig',
-      '--output-dill=$constsDill',
-      consts,
+      '--output-dill=$dillPath',
+      dartSource,
     ]));
 
+    resourcesToDispose.add(dillPath);
+  }
+
+  void _compileWebDill(String dillPath, String dartSource) {
     checkProcessResult(Process.runSync(dart, <String>[
-      frontendServer,
-      '--sdk-root=$sdkRoot',
-      '--target=flutter',
-      '--aot',
-      '--tfa',
+      'compile',
+      'js',
+      '--libraries-spec=$librariesSpec',
+      '-Ddart.vm.product=true',
+      '-o',
+      dillPath,
       '--packages=$packageConfig',
-      '--output-dill=$constsAndNonDill',
-      constsAndNon,
+      '--cfe-only',
+      dartSource,
     ]));
 
-    _checkRecursion();
-    _checkConsts();
-    _checkNonConsts();
-  } finally {
-    try {
-      File(constsDill).deleteSync();
-      File(constsAndNonDill).deleteSync();
-    } finally {
-      stdout.writeln('Tests ${exitCode == 0 ? 'succeeded' : 'failed'} - exit code: $exitCode');
-    }
+    resourcesToDispose.add(dillPath);
   }
 }
+
+enum Compiler {
+  frontendServer,
+  dart2js,
+}