Batch the batch compiler for tests

test/codegen_test.dart

 // Copyright (c) 2015, 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.
 
 /// Tests code generation.
 /// Runs Dart Dev Compiler on all input in the `codegen` directory and checks
 /// that the output is what we expected.
 library dev_compiler.test.codegen_test;
 
 import 'dart:io';
@@ skipping 47 matching lines @@
 
   tearDown(() {
     if (loggerSub != null) {
       loggerSub.cancel();
       loggerSub = null;
     }
   });
 
   var expectDir = path.join(inputDir, 'expect');
 
-  bool compile(String entryPoint, AnalysisContext context,
+  BatchCompiler createCompiler(AnalysisContext context,
       {bool checkSdk: false, bool sourceMaps: false, bool closure: false}) {
     // TODO(jmesserly): add a way to specify flags in the test file, so
     // they're more self-contained.
     var runtimeDir = path.join(path.dirname(testDirectory), 'lib', 'runtime');
     var options = new CompilerOptions(
         codegenOptions: new CodegenOptions(
             outputDir: expectDir,
             emitSourceMaps: sourceMaps,
             closure: closure,
             forceCompile: checkSdk),
         useColors: false,
         checkSdk: checkSdk,
         runtimeDir: runtimeDir,
-        inputs: [entryPoint],
         inputBaseDir: inputDir);
     var reporter = createErrorReporter(context, options);
-    return new BatchCompiler(context, options, reporter: reporter).run();
+    return new BatchCompiler(context, options, reporter: reporter);
+  }
+
+  bool compile(BatchCompiler compiler, String filePath) {
+    compiler.compileFromUriString(filePath, (String url) {

[Jennifer Messerly, 2015/10/02 18:22:36]

it might be simpler to just pass it the per file messages?

I feel like the API the test actually wants is the List<Errors> for the given
compile. Instead we set up an error stream and rely on a call back and stuff ...
it depends on some side effects/impl details. Maybe a more functional approach,
where we just return the errors, would be better.

(also AFAIK, AnalysisError has the Source which has the URI, so even given a raw
list of errors, we could figure out what file they came from)

+      // Write compiler messages to disk.
+      var messagePath = '${path.withoutExtension(url)}.txt';
+      var file = new File(messagePath);
+      var message = '''
+// Messages from compiling ${path.basenameWithoutExtension(url)}.dart

[Jennifer Messerly, 2015/10/02 18:22:36]

another thought here... when I was looking at making compiler more incremental
(https://codereview.chromium.org/1322333003/

I actually changed it to have the compiler save messages in a text file. Not
sure if that's still worth doing. But it helps us keep things incremental even
for files that failed to compile.

+$compilerMessages''';
+      file.writeAsStringSync(message);
+      compilerMessages.clear();
+    });
+    return !compiler.failure;
   }
 
   var multitests = new Set<String>();
   {
     // Expand wacky multitests into a bunch of test files.
     // We'll compile each one as if it was an input.
     var languageDir = path.join(inputDir, 'language');
     var testFiles = _findTests(languageDir, filePattern);
 
     for (var filePath in testFiles) {
       if (filePath.endsWith('_multi.dart')) continue;
 
       var contents = new File(filePath).readAsStringSync();
       if (isMultiTest(contents)) {
         multitests.add(filePath);
 
         var tests = new Map<String, String>();
         var outcomes = new Map<String, Set<String>>();
         extractTestsFromMultitest(filePath, contents, tests, outcomes);
 
         var filename = path.basenameWithoutExtension(filePath);
         tests.forEach((name, contents) {
           new File(path.join(languageDir, '${filename}_${name}_multi.dart'))
               .writeAsStringSync(contents);
         });
       }
     }
   }
 
+  var batchCompiler = createCompiler(realSdkContext);
+
   for (var dir in [null, 'language']) {
     if (codeCoverage && dir == 'language') continue;
 
     group('dartdevc ' + path.join('test', 'codegen', dir), () {
       var outDir = new Directory(path.join(expectDir, dir));
       if (!outDir.existsSync()) outDir.createSync(recursive: true);
 
       var testFiles = _findTests(path.join(inputDir, dir), filePattern);
       for (var filePath in testFiles) {
         if (multitests.contains(filePath)) continue;
 
         var filename = path.basenameWithoutExtension(filePath);
 
         test('$filename.dart', () {
-          compilerMessages.writeln('// Messages from compiling $filename.dart');
-
           // TODO(jmesserly): this was added to get some coverage of source maps
           // and closure annotations.
           // We need a more comprehensive strategy to test them.
           var sourceMaps = filename == 'map_keys';
           var closure = filename == 'closure';
-          var success = compile(filePath, realSdkContext,
-              sourceMaps: sourceMaps, closure: closure);
-
-          // Write compiler messages to disk.
-          new File(path.join(outDir.path, '$filename.txt'))
-              .writeAsStringSync('$compilerMessages');
+          var success;
+          // TODO(vsm): Is it okay to reuse the same context here?  If there is

[Jennifer Messerly, 2015/10/02 18:22:36]

yeah, good TODO. I think this is because I didn't previously understand that SDK
had its own nested context thingy (you can tell from my "realSdkContext" name,
which is a bit misleading). We could share the context for the SDK (to avoid 4-8
second analysis or whatever it's at now), but create a new context for each of
the test configurations. That would probably be cheap and would resolve the
TODO.

+          // overlap between test files, we may need separate ones for each
+          // compiler.
+          var compiler = (sourceMaps || closure)
+              ? createCompiler(realSdkContext,
+                  sourceMaps: sourceMaps, closure: closure)
+              : batchCompiler;
+          success = compile(compiler, filePath);
 
           var outFile = new File(path.join(outDir.path, '$filename.js'));
           expect(!success || outFile.existsSync(), true,
               reason: '${outFile.path} was created if compilation succeeds');
         });
       }
     });
   }
 
   if (codeCoverage) {
@@ skipping 14 matching lines @@
 
       test('devc dart:core', () {
         var testSdkContext = createAnalysisContextWithSources(
             new StrongModeOptions(),
             new SourceResolverOptions(
                 dartSdkPath:
                     path.join(testDirectory, '..', 'tool', 'generated_sdk')));
 
         // Get the test SDK. We use a checked in copy so test expectations can
         // be generated against a specific SDK version.
-        compile('dart:core', testSdkContext, checkSdk: true);
+        var compiler = createCompiler(testSdkContext, checkSdk: true);
+        compile(compiler, 'dart:core');
         var outFile = new File(path.join(expectDir, 'dart/core.js'));
         expect(outFile.existsSync(), true,
             reason: '${outFile.path} was created for dart:core');
       });
     });
   }
 
   var expectedRuntime =
       defaultRuntimeFiles.map((f) => 'dev_compiler/runtime/$f');
 
   test('devc jscodegen sunflower.html', () {
     var filePath = path.join(inputDir, 'sunflower', 'sunflower.html');
-    compilerMessages.writeln('// Messages from compiling sunflower.html');
-
-    var success = compile(filePath, realSdkContext);
-
-    // Write compiler messages to disk.
-    new File(path.join(expectDir, 'sunflower', 'sunflower.txt'))
-        .writeAsStringSync(compilerMessages.toString());
+    var success = compile(batchCompiler, filePath);
 
     var expectedFiles = ['sunflower.html', 'sunflower.js',];
 
     for (var filepath in expectedFiles) {
       var outFile = new File(path.join(expectDir, 'sunflower', filepath));
       expect(outFile.existsSync(), success,
           reason: '${outFile.path} was created iff compilation succeeds');
     }
   });
 
   test('devc jscodegen html_input.html', () {
     var filePath = path.join(inputDir, 'html_input.html');
-    compilerMessages.writeln('// Messages from compiling html_input.html');
-
-    var success = compile(filePath, realSdkContext);
-
-    // Write compiler messages to disk.
-    new File(path.join(expectDir, 'html_input.txt'))
-        .writeAsStringSync(compilerMessages.toString());
+    var success = compile(batchCompiler, filePath);
 
     var expectedFiles = [
       'html_input.html',
       'dir/html_input_a.js',
       'dir/html_input_b.js',
       'dir/html_input_c.js',
       'dir/html_input_d.js',
       'dir/html_input_e.js'
     ]..addAll(expectedRuntime);
 
@@ skipping 11 matching lines @@
     print('[AnalysisEngine] error $message $exception');
   }
 
   @override void logError2(String message, Object exception) {
     print('[AnalysisEngine] error $message $exception');
   }
 
   void logInformation(String message, [CaughtException exception]) {}
   void logInformation2(String message, Object exception) {}
 }