From a1af1bb92f2e6b1bb2d0969fac3695a2d40c4c43 Mon Sep 17 00:00:00 2001 From: Ian Hickson Date: Wed, 10 Aug 2022 16:25:23 -0700 Subject: [PATCH] Actually run customer_testing shard on Windows (#109336) --- dev/customer_testing/ci.bat | 14 +++++++++++--- dev/customer_testing/ci.sh | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dev/customer_testing/ci.bat b/dev/customer_testing/ci.bat index d8669892d2..3221f9a0c8 100644 --- a/dev/customer_testing/ci.bat +++ b/dev/customer_testing/ci.bat @@ -8,12 +8,20 @@ REM This should match the ci.sh file in this directory. REM This is called from the LUCI recipes: REM https://flutter.googlesource.com/recipes/+/refs/heads/master/recipe_modules/adhoc_validation/resources/customer_testing.bat -dart __deprecated_pub get +ECHO. +ECHO Updating pub packages... +CALL dart pub get CD ..\tools -dart __deprecated_pub get +CALL dart pub get CD ..\customer_testing +ECHO. +ECHO Finding correct version of customer tests... CMD /S /C "IF EXIST "..\..\bin\cache\pkg\tests\" RMDIR /S /Q ..\..\bin\cache\pkg\tests" git clone https://github.com/flutter/tests.git ..\..\bin\cache\pkg\tests FOR /F "usebackq tokens=*" %%a IN (`dart --enable-asserts ..\tools\bin\find_commit.dart ..\..\bin\cache\pkg\tests`) DO git -C ..\..\bin\cache\pkg\tests checkout %%a -dart --enable-asserts run_tests.dart --verbose --skip-on-fetch-failure --skip-template ..\..\bin\cache\pkg\tests\registry\*.test + +ECHO. +ECHO Running tests... +CD ..\..\bin\cache\pkg\tests +CALL dart --enable-asserts ..\..\..\..\dev\customer_testing\run_tests.dart --verbose --skip-on-fetch-failure --skip-template registry/*.test diff --git a/dev/customer_testing/ci.sh b/dev/customer_testing/ci.sh index 495b21c6fd..dba10d3156 100755 --- a/dev/customer_testing/ci.sh +++ b/dev/customer_testing/ci.sh @@ -15,8 +15,8 @@ set -ex # largely not needed to run the flutter/tests tests. # # However, we do need to update this directory and the tools directory. -dart __deprecated_pub get -(cd ../tools; dart __deprecated_pub get) # used for find_commit.dart below +dart pub get +(cd ../tools; dart pub get) # used for find_commit.dart below # Next we need to update the flutter/tests checkout. #