Pass additional options in incremental setup

pkg/front_end/test/incremental_kernel_generator_test.dart

Index: pkg/front_end/test/incremental_kernel_generator_test.dart
diff --git a/pkg/front_end/test/incremental_kernel_generator_test.dart b/pkg/front_end/test/incremental_kernel_generator_test.dart
index 2bb21d0d6125ab37fb18d6301be349ddbe12188a..ba6d200835af2eb0de7e471bc80d18349392a327 100644
--- a/pkg/front_end/test/incremental_kernel_generator_test.dart
+++ b/pkg/front_end/test/incremental_kernel_generator_test.dart
@@ -34,7 +34,8 @@ class IncrementalKernelGeneratorTest {
   IncrementalKernelGeneratorImpl incrementalKernelGenerator;
 
   /// Compute the initial [Program] for the given [entryPoint].
-  Future<Program> getInitialState(Uri entryPoint) async {
+  Future<Program> getInitialState(Uri entryPoint,
+      {bool setPackages: true}) async {
     Map<String, Uri> dartLibraries = createSdkFiles(fileSystem);
     // TODO(scheglov) Builder the SDK kernel and set it into the options.
 
@@ -46,8 +47,11 @@ class IncrementalKernelGeneratorTest {
 //      ..logger = new PerformanceLog(stdout)
       ..strongMode = true
       ..chaseDependencies = true
-      ..dartLibraries = dartLibraries
-      ..packagesFileUri = Uri.parse('file:///test/.packages');
+      ..dartLibraries = dartLibraries;
+
+    if (setPackages) {
+      compilerOptions.packagesFileUri = Uri.parse('file:///test/.packages');
+    }
     incrementalKernelGenerator = await IncrementalKernelGenerator
         .newInstance(compilerOptions, entryPoint, watch: watchFn);
     return (await incrementalKernelGenerator.computeDelta()).newProgram;
@@ -230,6 +234,32 @@ static method main() → dynamic {
     }
   }
 
+  // Ensures that the `.packages` file can be discovered automatically
+  // from the entry point file.

[scheglov, 2017/08/01 21:23:52]

Please don't put non-documentation comments outside of methods, they might be
disassociated from methods during members sorting.

[Siggi Cherem (dart-lang), 2017/08/01 21:37:34]

Done. (though, that sounds like a bug for the editor?)

+  test_inferPackagesFile() async {
+    writeFile('/test/.packages', 'test:lib/');
+    String path = '/test/lib/test.dart';
+    Uri uri = writeFile(path, r'''
+main() {

[scheglov, 2017/08/01 21:23:52]

This is not quite representative test.

I think it would fail, but it would be better if this file imported a library
using package: URI and referenced an element declared in this library.

[Siggi Cherem (dart-lang), 2017/08/01 21:37:34]

Done. Good point. It was before failing as early as we allocated the IKG, which
is why I started with the previous test.

+  var v = 1;
+}
+''');
+
+    String initialText = r'''
+library;
+import self as self;
+import "dart:core" as core;
+
+static method main() → dynamic {
+  core::int v = 1;
+}
+''';
+
+    Program program = await getInitialState(uri, setPackages: false);
+    Library library = _getLibrary(program, uri);
+    expect(_getLibraryText(library), initialText);
+  }
+
   test_watch() async {
     writeFile('/test/.packages', 'test:lib/');
     String aPath = '/test/lib/a.dart';