Merge branch 'master' of github.com:flutter/flutter into add_network_…

…image_impl

.cirrus.yml

@@ -79,6 +79,11 @@ task:
     - name: web_tests-linux
       env:
         SHARD: web_tests
+      test_script:
+        - dart --enable-asserts ./dev/bots/test.dart
+      container:
+        cpu: 4
+        memory: 12G
     - name: build_tests-linux
       env:
         SHARD: build_tests
@@ -181,6 +186,8 @@ task:
   # with the actual time - this should help to verify
   print_date_script:
     - date
+  install_cocoapods_script:
+    - sudo gem install cocoapods
   git_fetch_script:
     - git clean -xfd
     - git fetch origin

bin/internal/engine.version

@@ -1 +1 @@
-ddd36e8338ab4c4369ec5d46c1085d8caad6fe9a
+f3ab2e412f07a0fb82944d1f7af86c31e674e6c9

bin/internal/fuchsia-linux.version

@@ -1 +1 @@
-uI84cLMvUcCVvP7F8oYeZZwqpUbZXuNS-p0kagG0hiIC
+vNYZ8HJTCon7E4ZNYhHdp1_oxuamywy6h6k3P5o87gMC

bin/internal/fuchsia-mac.version

@@ -1 +1 @@
-QtSiDoskaoFsL67Z7NykwUxxyaLf8ObizHYbIDU-K8EC
+dlTnrGYzUeH_I3maotaRr6G1QsC6NWuXBP2PD_CLcpwC

dev/bots/test.dart

@@ -341,15 +341,10 @@ Future<void> _runTests() async {
 }
 
 Future<void> _runWebTests() async {
-  final List<String> testfiles = <String>[];
-  final Directory foundation = Directory(path.join(flutterRoot, 'packages', 'flutter', 'test', 'foundation'));
-  for (FileSystemEntity entity in foundation.listSync(recursive: true)) {
-    if (entity is File) {
-      testfiles.add(entity.path);
-    }
-  }
-  await _runFlutterWebTest(path.join(flutterRoot, 'packages', 'flutter'), expectFailure: true, tests: <String>[
-    path.join('test', 'foundation'),
+  await _runFlutterWebTest(path.join(flutterRoot, 'packages', 'flutter'), expectFailure: false, tests: <String>[
+    'test/foundation/',
+    'test/painting/',
+    'test/scheduler/',
   ]);
 }
 
@@ -612,23 +607,30 @@ Future<void> _runFlutterWebTest(String workingDirectory, {
   Duration timeout = _kLongTimeout,
   List<String> tests,
 }) async {
-  final List<String> args = <String>['test', '--platform=chrome'];
+  final List<String> args = <String>['test', '-v', '--platform=chrome'];
   if (flutterTestArgs != null && flutterTestArgs.isNotEmpty)
     args.addAll(flutterTestArgs);
 
-  args.add('--machine');
   args.addAll(tests);
 
-  await runCommand(
-    flutter,
-    args,
-    workingDirectory: workingDirectory,
-    expectNonZeroExit: expectFailure,
-    timeout: timeout,
-    environment: <String, String>{
-      'FLUTTER_WEB': 'true',
-    },
-  );
+  // TODO(jonahwilliams): fix relative path issues to make this unecessary.
+  final Directory oldCurrent = Directory.current;
+  Directory.current = Directory(path.join(flutterRoot, 'packages', 'flutter'));
+  try {
+    await runCommand(
+      flutter,
+      args,
+      workingDirectory: workingDirectory,
+      expectNonZeroExit: expectFailure,
+      timeout: timeout,
+      environment: <String, String>{
+        'FLUTTER_WEB': 'true',
+        'FLUTTER_LOW_RESOURCE_MODE': 'true',
+      },
+    );
+  } finally {
+    Directory.current = oldCurrent;
+  }
 }
 
 Future<void> _runFlutterTest(String workingDirectory, {