Merge branch 'master' into coveralls

dart-lang · Dec 13, 2018 · a91d23c · a91d23c
2 parents 628f718 + 62aad41
commit a91d23c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/test/compare_output_test.dart b/test/compare_output_test.dart
@@ -67,9 +67,7 @@ void main() {
               'Top level package requires Flutter but FLUTTER_ROOT environment variable not set|test_package_flutter_plugin requires the Flutter SDK, version solving failed')));
       expect(result.stderr, isNot(contains('asynchronous gap')));
       expect(result.exitCode, isNot(0));
-    },
-        skip:
-            true /* TODO(gspencer): Re-enable as soon as Flutter's config is sane again. */);
+    });
 
     test("Validate --version works", () async {
       var args = <String>[dartdocBin, '--version'];

diff --git a/testing/test_package_flutter_plugin/.gitignore b/testing/test_package_flutter_plugin/.gitignore
@@ -0,0 +1 @@
+android/**
diff --git a/tool/grind.dart b/tool/grind.dart
@@ -592,8 +592,7 @@ Future<void> serveFlutterDocs() async {
 }
 
 @Task('Validate flutter docs')
-// TODO(jcollins-g): add buildDartdocFlutterPluginDocs once passing
-@Depends(buildFlutterDocs)
+@Depends(buildFlutterDocs, buildDartdocFlutterPluginDocs)
 void validateFlutterDocs() {}
 
 @Task('Build flutter docs')
@@ -641,6 +640,11 @@ class FlutterRepo {
       ['precache'],
       workingDirectory: flutterPath,
     );
+    await launcher.runStreamed(
+      bin,
+      ['update-packages'],
+      workingDirectory: flutterPath,
+    );
   }
 
   factory FlutterRepo.fromPath(String flutterPath, Map<String, String> env,
@@ -929,6 +933,8 @@ Future<WarningsCollection> _buildDartdocFlutterPluginDocs() async {
           [
             '--enable-asserts',
             pathLib.join(Directory.current.path, 'bin', 'dartdoc.dart'),
+            '--exclude-packages',
+            'Dart', // TODO(jcollins-g): dart-lang/dartdoc#1431
             '--json',
             '--link-to-remote',
             '--output',