diff --git a/ci/analyze.sh b/ci/analyze.sh index ed24df20c7e4c..6b57a819a0119 100755 --- a/ci/analyze.sh +++ b/ci/analyze.sh @@ -48,7 +48,6 @@ echo "" "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/ci" "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/flutter_frontend_server" -"$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/impeller/golden_tests_harvester" "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/impeller/tessellator/dart" "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/lib/gpu" "$DART" analyze --fatal-infos --fatal-warnings "$FLUTTER_DIR/lib/ui" diff --git a/ci/licenses_golden/excluded_files b/ci/licenses_golden/excluded_files index f7f8bc69f2a99..ad05a09048740 100644 --- a/ci/licenses_golden/excluded_files +++ b/ci/licenses_golden/excluded_files @@ -166,13 +166,6 @@ ../../../flutter/impeller/geometry/size_unittests.cc ../../../flutter/impeller/geometry/trig_unittests.cc ../../../flutter/impeller/golden_tests/README.md -../../../flutter/impeller/golden_tests_harvester/.dart_tool -../../../flutter/impeller/golden_tests_harvester/.gitignore -../../../flutter/impeller/golden_tests_harvester/README.md -../../../flutter/impeller/golden_tests_harvester/analysis_options.yaml -../../../flutter/impeller/golden_tests_harvester/pubspec.lock -../../../flutter/impeller/golden_tests_harvester/pubspec.yaml -../../../flutter/impeller/golden_tests_harvester/test ../../../flutter/impeller/image/README.md ../../../flutter/impeller/playground ../../../flutter/impeller/renderer/backend/gles/test diff --git a/ci/licenses_golden/licenses_flutter b/ci/licenses_golden/licenses_flutter index 6d5dece0bce16..976bdfb45e82d 100644 --- a/ci/licenses_golden/licenses_flutter +++ b/ci/licenses_golden/licenses_flutter @@ -5327,9 +5327,6 @@ ORIGIN: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.h + ../../.. ORIGIN: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.mm + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/golden_tests/working_directory.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/golden_tests/working_directory.h + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/golden_tests_harvester/bin/golden_tests_harvester.dart + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/golden_tests_harvester/lib/golden_tests_harvester.dart + ../../../flutter/LICENSE -ORIGIN: ../../../flutter/impeller/golden_tests_harvester/lib/logger.dart + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.cc + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.h + ../../../flutter/LICENSE ORIGIN: ../../../flutter/impeller/image/compressed_image.cc + ../../../flutter/LICENSE @@ -8183,9 +8180,6 @@ FILE: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.h FILE: ../../../flutter/impeller/golden_tests/vulkan_screenshotter.mm FILE: ../../../flutter/impeller/golden_tests/working_directory.cc FILE: ../../../flutter/impeller/golden_tests/working_directory.h -FILE: ../../../flutter/impeller/golden_tests_harvester/bin/golden_tests_harvester.dart -FILE: ../../../flutter/impeller/golden_tests_harvester/lib/golden_tests_harvester.dart -FILE: ../../../flutter/impeller/golden_tests_harvester/lib/logger.dart FILE: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.cc FILE: ../../../flutter/impeller/image/backends/skia/compressed_image_skia.h FILE: ../../../flutter/impeller/image/compressed_image.cc diff --git a/impeller/golden_tests/README.md b/impeller/golden_tests/README.md index 6ecd6daf9ab46..8e590ee0938c2 100644 --- a/impeller/golden_tests/README.md +++ b/impeller/golden_tests/README.md @@ -2,7 +2,7 @@ This is the executable that will generate the golden image results that can then be sent to Skia Gold vial the -[golden_tests_harvester]("../golden_tests_harvester"). +[golden_tests_harvester]("../../tools/golden_tests_harvester"). Running these tests should happen from [//flutter/testing/run_tests.py](../../testing/run_tests.py). That will do all diff --git a/testing/run_tests.py b/testing/run_tests.py index 6be8359ef6082..777be7fccc1f5 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -1110,7 +1110,7 @@ def run_impeller_golden_tests(build_dir: str): 'Cannot find the "impeller_golden_tests" executable in "%s". You may need to build it.' % (build_dir) ) - harvester_path: Path = Path(SCRIPT_DIR).parent.joinpath('impeller').joinpath( + harvester_path: Path = Path(SCRIPT_DIR).parent.joinpath('tools').joinpath( 'golden_tests_harvester' ) with tempfile.TemporaryDirectory(prefix='impeller_golden') as temp_dir: diff --git a/impeller/golden_tests_harvester/.gitignore b/tools/golden_tests_harvester/.gitignore similarity index 100% rename from impeller/golden_tests_harvester/.gitignore rename to tools/golden_tests_harvester/.gitignore diff --git a/impeller/golden_tests_harvester/README.md b/tools/golden_tests_harvester/README.md similarity index 74% rename from impeller/golden_tests_harvester/README.md rename to tools/golden_tests_harvester/README.md index 9920093f3ecb7..b3d6451e284f3 100644 --- a/impeller/golden_tests_harvester/README.md +++ b/tools/golden_tests_harvester/README.md @@ -7,8 +7,8 @@ Reaps the output of impeller's golden image tests and sends it to Skia gold. ```sh cd $SRC ./out/host_debug_unopt_arm64/impeller_golden_tests --working_dir=~/Desktop/temp -cd flutter/impeller/golden_tests_harvester +cd flutter/tools/golden_tests_harvester dart run ./bin/golden_tests_harvester.dart ~/Desktop/temp ``` -See also [golden_tests](../golden_tests/). +See also [golden_tests](../impeller/golden_tests/). diff --git a/impeller/golden_tests_harvester/analysis_options.yaml b/tools/golden_tests_harvester/analysis_options.yaml similarity index 100% rename from impeller/golden_tests_harvester/analysis_options.yaml rename to tools/golden_tests_harvester/analysis_options.yaml diff --git a/impeller/golden_tests_harvester/bin/golden_tests_harvester.dart b/tools/golden_tests_harvester/bin/golden_tests_harvester.dart similarity index 100% rename from impeller/golden_tests_harvester/bin/golden_tests_harvester.dart rename to tools/golden_tests_harvester/bin/golden_tests_harvester.dart diff --git a/impeller/golden_tests_harvester/lib/golden_tests_harvester.dart b/tools/golden_tests_harvester/lib/golden_tests_harvester.dart similarity index 100% rename from impeller/golden_tests_harvester/lib/golden_tests_harvester.dart rename to tools/golden_tests_harvester/lib/golden_tests_harvester.dart diff --git a/impeller/golden_tests_harvester/lib/logger.dart b/tools/golden_tests_harvester/lib/logger.dart similarity index 100% rename from impeller/golden_tests_harvester/lib/logger.dart rename to tools/golden_tests_harvester/lib/logger.dart diff --git a/impeller/golden_tests_harvester/pubspec.yaml b/tools/golden_tests_harvester/pubspec.yaml similarity index 100% rename from impeller/golden_tests_harvester/pubspec.yaml rename to tools/golden_tests_harvester/pubspec.yaml diff --git a/impeller/golden_tests_harvester/test/golden_tests_harvester_test.dart b/tools/golden_tests_harvester/test/golden_tests_harvester_test.dart similarity index 100% rename from impeller/golden_tests_harvester/test/golden_tests_harvester_test.dart rename to tools/golden_tests_harvester/test/golden_tests_harvester_test.dart diff --git a/tools/pub_get_offline.py b/tools/pub_get_offline.py index f5e41ba3245e1..dd67b22e2f06d 100644 --- a/tools/pub_get_offline.py +++ b/tools/pub_get_offline.py @@ -22,7 +22,6 @@ ALL_PACKAGES = [ os.path.join(ENGINE_DIR, 'ci'), os.path.join(ENGINE_DIR, 'flutter_frontend_server'), - os.path.join(ENGINE_DIR, 'impeller', 'golden_tests_harvester'), os.path.join(ENGINE_DIR, 'impeller', 'tessellator', 'dart'), os.path.join(ENGINE_DIR, 'shell', 'vmservice'), os.path.join(ENGINE_DIR, 'testing', 'android_background_image'), @@ -40,6 +39,7 @@ os.path.join(ENGINE_DIR, 'tools', 'const_finder'), os.path.join(ENGINE_DIR, 'tools', 'gen_web_locale_keymap'), os.path.join(ENGINE_DIR, 'tools', 'githooks'), + os.path.join(ENGINE_DIR, 'tools', 'golden_tests_harvester'), os.path.join(ENGINE_DIR, 'tools', 'header_guard_check'), os.path.join(ENGINE_DIR, 'tools', 'licenses'), os.path.join(ENGINE_DIR, 'tools', 'path_ops', 'dart'),