From 4e509b428cc23495d1aefa72c419618f9b34e754 Mon Sep 17 00:00:00 2001 From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Fri, 17 Mar 2023 01:09:45 -0700 Subject: [PATCH 1/5] roll cocoon rfw tiler --- registry/DanTup_tiler.test | 4 ++-- registry/flutter_cocoon.test | 2 +- registry/flutter_packages.test | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/registry/DanTup_tiler.test b/registry/DanTup_tiler.test index 255d1a96..614c83d2 100644 --- a/registry/DanTup_tiler.test +++ b/registry/DanTup_tiler.test @@ -6,9 +6,9 @@ contact=danny@tuppeny.com fetch=git clone https://github.com/DanTup/tiler.git tests -fetch=git -C tests checkout 3cb0cad96cc393b85cf7e38c4623cc16390f906e +fetch=git -C tests checkout 0f80585f1f7d9a01a463c316e44c59b3cc86f9f0 fetch=git -C tests submodule init fetch=git -C tests submodule update --recursive update=. test=flutter analyze --no-fatal-infos -test=flutter test test +test=USE_FLUTTER_TEST_FONT=1 flutter test test diff --git a/registry/flutter_cocoon.test b/registry/flutter_cocoon.test index 8443f1dd..9a110e77 100644 --- a/registry/flutter_cocoon.test +++ b/registry/flutter_cocoon.test @@ -1,6 +1,6 @@ contact=flutter-infra@google.com fetch=git clone https://github.com/flutter/cocoon.git tests -fetch=git -C tests checkout 161471147dd133272e549904b83e3ef74aeeb3c5 +fetch=git -C tests checkout 96c1e8154eeb7d141f74981835b311bd520c5cec update=dashboard # Runs flutter analyze, flutter test, and builds web platform test.posix=./test_utilities/bin/flutter_test_runner.sh dashboard diff --git a/registry/flutter_packages.test b/registry/flutter_packages.test index 2136139d..07cb23ad 100644 --- a/registry/flutter_packages.test +++ b/registry/flutter_packages.test @@ -9,6 +9,6 @@ contact=ian@hixie.ch update=packages/rfw fetch=git -c core.longPaths=true clone https://github.com/flutter/packages.git tests -fetch=git -c core.longPaths=true -C tests checkout cd336474756ea8e120d0c0146398b5a9c76fa229 +fetch=git -c core.longPaths=true -C tests checkout 784291b4fdf4c95c5c5e57fc465cbd16fece35ba test.windows=.\customer_testing.bat test.posix=./customer_testing.sh From d26213878146e155ff1249495cfee82b8f389d8a Mon Sep 17 00:00:00 2001 From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Fri, 17 Mar 2023 01:32:28 -0700 Subject: [PATCH 2/5] fix flag --- registry/DanTup_tiler.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/registry/DanTup_tiler.test b/registry/DanTup_tiler.test index 614c83d2..6885a4f0 100644 --- a/registry/DanTup_tiler.test +++ b/registry/DanTup_tiler.test @@ -11,4 +11,6 @@ fetch=git -C tests submodule init fetch=git -C tests submodule update --recursive update=. test=flutter analyze --no-fatal-infos -test=USE_FLUTTER_TEST_FONT=1 flutter test test +test.windows=set USE_FLUTTER_TEST_FONT=1 +test.windows=flutter test test +test.posix=env USE_FLUTTER_TEST_FONT=1 flutter test test From a7d3dafd936c16ecdec31edd4fbc3ce4b65c878c Mon Sep 17 00:00:00 2001 From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Fri, 17 Mar 2023 09:51:56 -0700 Subject: [PATCH 3/5] ? --- registry/DanTup_tiler.test | 1 + registry/flutter_packages.test | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/registry/DanTup_tiler.test b/registry/DanTup_tiler.test index 6885a4f0..9d61cd16 100644 --- a/registry/DanTup_tiler.test +++ b/registry/DanTup_tiler.test @@ -12,5 +12,6 @@ fetch=git -C tests submodule update --recursive update=. test=flutter analyze --no-fatal-infos test.windows=set USE_FLUTTER_TEST_FONT=1 +test.windows=set test.windows=flutter test test test.posix=env USE_FLUTTER_TEST_FONT=1 flutter test test diff --git a/registry/flutter_packages.test b/registry/flutter_packages.test index 07cb23ad..9169c84b 100644 --- a/registry/flutter_packages.test +++ b/registry/flutter_packages.test @@ -10,5 +10,6 @@ update=packages/rfw fetch=git -c core.longPaths=true clone https://github.com/flutter/packages.git tests fetch=git -c core.longPaths=true -C tests checkout 784291b4fdf4c95c5c5e57fc465cbd16fece35ba +test.windows=set USE_FLUTTER_TEST_FONT=1 test.windows=.\customer_testing.bat -test.posix=./customer_testing.sh +test.posix=env USE_FLUTTER_TEST_FONT=1 ./customer_testing.sh From 3585b07cd6846c8fe088d290e07a9c3458a84dc3 Mon Sep 17 00:00:00 2001 From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Fri, 17 Mar 2023 11:21:26 -0700 Subject: [PATCH 4/5] workaround windows --- registry/DanTup_tiler.test | 2 -- scripts/verify_tests_on_master.bat | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/registry/DanTup_tiler.test b/registry/DanTup_tiler.test index 9d61cd16..77833d08 100644 --- a/registry/DanTup_tiler.test +++ b/registry/DanTup_tiler.test @@ -11,7 +11,5 @@ fetch=git -C tests submodule init fetch=git -C tests submodule update --recursive update=. test=flutter analyze --no-fatal-infos -test.windows=set USE_FLUTTER_TEST_FONT=1 -test.windows=set test.windows=flutter test test test.posix=env USE_FLUTTER_TEST_FONT=1 flutter test test diff --git a/scripts/verify_tests_on_master.bat b/scripts/verify_tests_on_master.bat index eb1488d1..465528b5 100644 --- a/scripts/verify_tests_on_master.bat +++ b/scripts/verify_tests_on_master.bat @@ -46,6 +46,7 @@ CD ..\..\.. :: Windows takes longer than the other systems to run tests. Default is lowered :: to 10 repeat runs to reduce strain on infra. @ECHO. +set USE_FLUTTER_TEST_FONT=1 CALL dart flutter\dev\customer_testing\run_tests.dart --repeat=10 --skip-template --shards %SHARDS% --shard-index %SHARD_INDEX% --verbose registry/*.test || GOTO :END @ECHO ON From 4017e8a1c5930b1db0e2ec2d2ccb79d40c5b23a3 Mon Sep 17 00:00:00 2001 From: LongCat is Looong <31859944+LongCatIsLooong@users.noreply.github.com> Date: Fri, 17 Mar 2023 14:34:38 -0700 Subject: [PATCH 5/5] temporarily disable tiler windows tests --- registry/DanTup_tiler.test | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/registry/DanTup_tiler.test b/registry/DanTup_tiler.test index 77833d08..0e092b1f 100644 --- a/registry/DanTup_tiler.test +++ b/registry/DanTup_tiler.test @@ -11,5 +11,7 @@ fetch=git -C tests submodule init fetch=git -C tests submodule update --recursive update=. test=flutter analyze --no-fatal-infos -test.windows=flutter test test +# TODO(LongCatIsLooong): uncomment once +# https://github.com/flutter/engine/pull/40352 lands in flutter/flutter +# test.windows=flutter test test test.posix=env USE_FLUTTER_TEST_FONT=1 flutter test test