Merge branch 'main' into engine-dir-contents-diff-tests

Author: matanlurey

DEPS

@@ -1000,7 +1000,7 @@ deps = {
      'packages': [
        {
         'package': 'fuchsia/sdk/core/linux-amd64',
-        'version': 'gKg6HlBeR52y-cMhu1lFKv7wxHoEM8Nw-b_pWokiVAkC'
+        'version': 'dLhvv964txwnSlvNw-qiuPtzH97grhOfLDOeg3QQKucC'
        }
      ],
      'condition': 'host_os == "linux" and not download_fuchsia_sdk',
@@ -1019,7 +1019,7 @@ deps = {
    },
 
   'src/third_party/impeller-cmake-example': {
-     'url': Var('flutter_git') + '/third_party/impeller-cmake-example.git' + '@' + 'd1a26a51dc6890e5f851749e3d8e048703f24f51',
+     'url': Var('flutter_git') + '/third_party/impeller-cmake-example.git' + '@' + 'c44e8093972c969acf171be72591e408a85fdc53',
      'condition': 'download_impeller_cmake_example',
   },
 

build/copy_info_plist.py

@@ -23,9 +23,7 @@
 
 def get_clang_version():
   clang_executable = str(
-      os.path.join(
-          '..', '..', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++'
-      )
+      os.path.join('..', '..', 'buildtools', 'mac-x64', 'clang', 'bin', 'clang++')
   )
   version = subprocess.check_output([clang_executable, '--version'])
   return version.splitlines()[0]
@@ -39,32 +37,20 @@ def main():
   )
 
   parser.add_argument(
-      '--source',
-      help='Path to Info.plist source template',
-      type=str,
-      required=True
+      '--source', help='Path to Info.plist source template', type=str, required=True
   )
   parser.add_argument(
-      '--destination',
-      help='Path to destination Info.plist',
-      type=str,
-      required=True
-  )
-  parser.add_argument(
-      '--minversion', help='Minimum device OS version like "9.0"', type=str
+      '--destination', help='Path to destination Info.plist', type=str, required=True
   )
+  parser.add_argument('--minversion', help='Minimum device OS version like "9.0"', type=str)
 
   args = parser.parse_args()
 
   text = open(args.source).read()
   engine_path = os.path.join(os.getcwd(), '..', '..', 'flutter')
   revision = git_revision.get_repository_version(engine_path)
   clang_version = get_clang_version()
-  text = text.format(
-      revision=revision,
-      clang_version=clang_version,
-      min_version=args.minversion
-  )
+  text = text.format(revision=revision, clang_version=clang_version, min_version=args.minversion)
 
   with open(args.destination, 'w') as outfile:
     outfile.write(text)

build/dart/tools/dart_pkg.py

@@ -16,9 +16,7 @@
 
 USE_LINKS = sys.platform != 'win32'
 
-DART_ANALYZE = os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), 'dart_analyze.py'
-)
+DART_ANALYZE = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'dart_analyze.py')
 
 
 def dart_filter(path):
@@ -164,10 +162,7 @@ def analyze_entrypoints(dart_sdk, package_root, entrypoints):
 def main():
   parser = argparse.ArgumentParser(description='Generate a dart-pkg')
   parser.add_argument(
-      '--dart-sdk',
-      action='store',
-      metavar='dart_sdk',
-      help='Path to the Dart SDK.'
+      '--dart-sdk', action='store', metavar='dart_sdk', help='Path to the Dart SDK.'
   )
   parser.add_argument(
       '--package-name',
@@ -183,28 +178,14 @@ def main():
       required=True
   )
   parser.add_argument(
-      '--package-root',
-      metavar='package_root',
-      help='packages/ directory',
-      required=True
-  )
-  parser.add_argument(
-      '--stamp-file',
-      metavar='stamp_file',
-      help='timestamp file',
-      required=True
+      '--package-root', metavar='package_root', help='packages/ directory', required=True
   )
+  parser.add_argument('--stamp-file', metavar='stamp_file', help='timestamp file', required=True)
   parser.add_argument(
-      '--entries-file',
-      metavar='entries_file',
-      help='script entries file',
-      required=True
+      '--entries-file', metavar='entries_file', help='script entries file', required=True
   )
   parser.add_argument(
-      '--package-sources',
-      metavar='package_sources',
-      help='Package sources',
-      nargs='+'
+      '--package-sources', metavar='package_sources', help='Package sources', nargs='+'
   )
   parser.add_argument(
       '--package-entrypoints',
@@ -259,16 +240,12 @@ def main():
   sdkext_path = os.path.join(lib_path, '_sdkext')
   if mappings:
     with open(sdkext_path, 'w') as stream:
-      json.dump(
-          mappings, stream, sort_keys=True, indent=2, separators=(',', ': ')
-      )
+      json.dump(mappings, stream, sort_keys=True, indent=2, separators=(',', ': '))
   else:
     remove_if_exists(sdkext_path)
 
   # Copy or symlink package sources into pkg directory.
-  common_source_prefix = os.path.dirname(
-      os.path.commonprefix(args.package_sources)
-  )
+  common_source_prefix = os.path.dirname(os.path.commonprefix(args.package_sources))
   for source in args.package_sources:
     relative_source = os.path.relpath(source, common_source_prefix)
     target = os.path.join(target_dir, relative_source)
@@ -291,9 +268,7 @@ def main():
       target = os.path.join(sdk_ext_dir, relative_source)
       copy_or_link(source, target)
 
-  common_source_prefix = os.path.dirname(
-      os.path.commonprefix(args.sdk_ext_files)
-  )
+  common_source_prefix = os.path.dirname(os.path.commonprefix(args.sdk_ext_files))
   for source in args.sdk_ext_files:
     relative_source = os.path.relpath(source, common_source_prefix)
     target = os.path.join(sdk_ext_dir, relative_source)

build/generate_coverage.py

@@ -13,19 +13,15 @@
 
 
 def get_llvm_bin_directory():
-  buildtool_dir = os.path.join(
-      os.path.dirname(os.path.realpath(__file__)), '../../buildtools'
-  )
+  buildtool_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '../../buildtools')
   platform_dir = ''
   if sys.platform.startswith('linux'):
     platform_dir = 'linux-x64'
   elif sys.platform == 'darwin':
     platform_dir = 'mac-x64'
   else:
     raise Exception('Unknown/Unsupported platform.')
-  llvm_bin_dir = os.path.abspath(
-      os.path.join(buildtool_dir, platform_dir, 'clang/bin')
-  )
+  llvm_bin_dir = os.path.abspath(os.path.join(buildtool_dir, platform_dir, 'clang/bin'))
   if not os.path.exists(llvm_bin_dir):
     raise Exception('LLVM directory %s double not be located.' % llvm_bin_dir)
   return llvm_bin_dir
@@ -61,9 +57,7 @@ def collect_profiles(args):
       print('Path %s does not exist.' % absolute_test_path)
       return -1
 
-    unstripped_test_path = os.path.join(
-        absolute_test_dir, 'exe.unstripped', test_name
-    )
+    unstripped_test_path = os.path.join(absolute_test_dir, 'exe.unstripped', test_name)
 
     if os.path.exists(unstripped_test_path):
       binaries.append(unstripped_test_path)
@@ -74,10 +68,7 @@ def collect_profiles(args):
 
     remove_if_exists(raw_profile)
 
-    print(
-        'Running test %s to gather profile.' %
-        os.path.basename(absolute_test_path)
-    )
+    print('Running test %s to gather profile.' % os.path.basename(absolute_test_path))
 
     test_command = [absolute_test_path]
 
@@ -105,8 +96,7 @@ def merge_profiles(llvm_bin_dir, raw_profiles, output):
   print('Merging %d raw profile(s) into single profile.' % len(raw_profiles))
   merged_profile_path = os.path.join(output, 'all.profile')
   remove_if_exists(merged_profile_path)
-  merge_command = [profdata_binary, 'merge', '-sparse'
-                  ] + raw_profiles + ['-o', merged_profile_path]
+  merge_command = [profdata_binary, 'merge', '-sparse'] + raw_profiles + ['-o', merged_profile_path]
   subprocess.check_call(merge_command)
   print('Done.')
   return merged_profile_path

build/git_revision.py

@@ -40,10 +40,7 @@ def main():
   parser = argparse.ArgumentParser()
 
   parser.add_argument(
-      '--repository',
-      action='store',
-      help='Path to the Git repository.',
-      required=True
+      '--repository', action='store', help='Path to the Git repository.', required=True
   )
 
   args = parser.parse_args()

build/zip.py

@@ -25,14 +25,10 @@ def _zip_dir(path, zip_file, prefix):
     for file in files:
       if os.path.islink(os.path.join(root, file)):
         add_symlink(
-            zip_file, os.path.join(root, file),
-            os.path.join(root.replace(path, prefix), file)
+            zip_file, os.path.join(root, file), os.path.join(root.replace(path, prefix), file)
         )
         continue
-      zip_file.write(
-          os.path.join(root, file),
-          os.path.join(root.replace(path, prefix), file)
-      )
+      zip_file.write(os.path.join(root, file), os.path.join(root.replace(path, prefix), file))
 
 
 def add_symlink(zip_file, source, target):
@@ -80,12 +76,7 @@ def main(args):
 
 if __name__ == '__main__':
   parser = argparse.ArgumentParser(description='This script creates zip files.')
-  parser.add_argument(
-      '-o',
-      dest='output',
-      action='store',
-      help='The name of the output zip file.'
-  )
+  parser.add_argument('-o', dest='output', action='store', help='The name of the output zip file.')
   parser.add_argument(
       '-i',
       dest='input_pairs',
@@ -94,9 +85,6 @@ def main(args):
       help='The input file and its destination location in the zip archive.'
   )
   parser.add_argument(
-      '-f',
-      dest='source_file',
-      action='store',
-      help='The path to the file list to zip.'
+      '-f', dest='source_file', action='store', help='The path to the file list to zip.'
   )
   sys.exit(main(parser.parse_args()))

ci/bin/format.dart

@@ -269,7 +269,9 @@ abstract class FormatChecker {
         ...types,
       ]);
     }
-    return output.split('\n').where((String line) => line.isNotEmpty).toList();
+    return output.split('\n').where(
+      (String line) => line.isNotEmpty && !line.contains('third_party')
+    ).toList();
   }
 
   /// Generates a reporting function to supply to ProcessRunner to use instead
@@ -285,7 +287,7 @@ abstract class FormatChecker {
       final String pendingStr = pending.toString().padLeft(3);
       final String failedStr = failed.toString().padLeft(3);
 
-      stderr.write('$name Jobs: $percent% done, '
+      stdout.write('$name Jobs: $percent% done, '
           '$completedStr/$totalStr completed, '
           '$inProgressStr in progress, '
           '$pendingStr pending, '
@@ -296,7 +298,7 @@ abstract class FormatChecker {
   /// Clears the last printed report line so garbage isn't left on the terminal.
   @protected
   void reportDone() {
-    stderr.write('\r${' ' * 100}\r');
+    stdout.write('\r${' ' * 100}\r');
   }
 }
 
@@ -436,7 +438,7 @@ class ClangFormatChecker extends FormatChecker {
       } else {
         error('Found ${failed.length} C++/ObjC/Shader file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
-        stdout.writeln('To fix, run:');
+        stdout.writeln('To fix, run `et format` or:');
         stdout.writeln();
         stdout.writeln('git apply <<DONE');
         for (final WorkerJob job in failed) {
@@ -594,7 +596,7 @@ class JavaFormatChecker extends FormatChecker {
       } else {
         error('Found ${failed.length} Java file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
-        stdout.writeln('To fix, run:');
+        stdout.writeln('To fix, run `et format` or:');
         stdout.writeln();
         stdout.writeln('git apply <<DONE');
         for (final WorkerJob job in failed) {
@@ -727,7 +729,7 @@ class GnFormatChecker extends FormatChecker {
       } else {
         error('Found ${failed.length} GN file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly.');
-        stdout.writeln('To fix, run:');
+        stdout.writeln('To fix, run `et format` or:');
         stdout.writeln();
         stdout.writeln('git apply <<DONE');
         for (final WorkerJob job in failed) {
@@ -822,7 +824,12 @@ class PythonFormatChecker extends FormatChecker {
       } else {
         error('Found ${incorrect.length} python file${plural ? 's' : ''}'
             ' which ${plural ? 'were' : 'was'} formatted incorrectly:');
-        incorrect.forEach(stderr.writeln);
+        stdout.writeln('To fix, run `et format` or:');
+        stdout.writeln();
+        stdout.writeln('git apply <<DONE');
+        incorrect.forEach(stdout.writeln);
+        stdout.writeln('DONE');
+        stdout.writeln();
       }
     } else {
       message('All python files formatted correctly.');
@@ -1129,7 +1136,7 @@ Future<int> main(List<String> arguments) async {
     message ??= '';
     switch (type) {
       case MessageType.message:
-        stderr.writeln(message);
+        stdout.writeln(message);
       case MessageType.error:
         stderr.writeln('ERROR: $message');
       case MessageType.warning:
@@ -1160,11 +1167,7 @@ Future<int> main(List<String> arguments) async {
           message('Unable to apply $humanCheckName format fixes.');
         }
       } else {
-        message('Performing $humanCheckName format check');
         stepResult = await checker.checkFormatting();
-        if (!stepResult) {
-          message('Found $humanCheckName format problems.');
-        }
       }
       result = result && stepResult;
     }