Merge pull request #59060 from compnerd/skipping

CI: add support to skip testing selectively on full builds

Author: compnerd

utils/build-windows-toolchain.bat

@@ -709,17 +709,99 @@ move %PackageRoot%\installer\installer.exe %BuildRoot%\artifacts || (exit /b)
 
 :: TODO(compnerd) test LLVM
 
+SET SKIP_TEST=0
+FOR %%T IN (%SKIP_TESTS%) DO (IF /I %%T==swift SET SKIP_TEST=1)
+IF "%SKIP_TEST%"=="0" call :TestSwift
+
+SET SKIP_TEST=0
+FOR %%T IN (%SKIP_TESTS%) DO (IF /I %T==dispatch SET SKIP_TEST=1)
+IF "%SKIP_TEST%"=="0" call :TestDispatch
+
+SET SKIP_TEST=0
+FOR %%T IN (%SKIP_TESTS%) DO (IF /I %T==foundation SET SKIP_TEST=1)
+IF "%SKIP_TEST%"=="0" call :TestFoundation
+
+SET SKIP_TEST=0
+FOR %%T IN (%SKIP_TESTS%) DO (IF /I %T==xctest SET SKIP_TEST=1)
+IF "%SKIP_TEST%"=="0" call :TestXCTest
+
+:: Clean up the module cache
+rd /s /q %LocalAppData%\clang\ModuleCache
+
+goto :end
+endlocal
+
+:CloneRepositories
+setlocal enableextensions enabledelayedexpansion
+
+if defined SKIP_UPDATE_CHECKOUT goto :eof
+
+if defined REPO_SCHEME set "args=--scheme %REPO_SCHEME%"
+
+:: Always enable symbolic links
+git config --global core.symlink true
+
+:: Ensure that we have the files in the original line endings, the swift tests
+:: depend on this being the case.
+git -C "%SourceRoot%\swift" config --local core.autocrlf input
+git -C "%SourceRoot%\swift" checkout-index --force --all
+
+set "args=%args% --skip-repository swift"
+set "args=%args% --skip-repository ninja"
+set "args=%args% --skip-repository icu"
+set "args=%args% --skip-repository swift-integration-tests"
+set "args=%args% --skip-repository swift-stress-tester"
+set "args=%args% --skip-repository swift-xcode-playground-support"
+
+call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-history --github-comment "%ghprbCommentBody%"
+
+goto :eof
+endlocal
+
+:CloneDependencies
+setlocal enableextensions enabledelayedexpansion
+
+:: Always enable symbolic links
+git config --global core.symlink true
+
+:: FIXME(compnerd) avoid the fresh clone
+rd /s /q zlib libxml2 sqlite icu curl
+
+git clone --quiet --no-tags --depth 1 --branch v1.2.11 https://github.com/madler/zlib
+git clone --quiet --no-tags --depth 1 --branch v2.9.12 https://github.com/gnome/libxml2
+git clone --quiet --no-tags --depth 1 --branch version-3.36.0 https://github.com/sqlite/sqlite
+git clone --quiet --no-tags --depth 1 --branch maint/maint-69 https://github.com/unicode-org/icu
+git clone --quiet --no-tags --depth 1 --branch curl-7_77_0 https://github.com/curl/curl
+
+goto :eof
+endlocal
+
+:TestSwift
+setlocal enableextensions enabledelayedexpansion
+
 :: Test Swift
 :: TODO(compnerd) make lit adjust the path properly
 path %BuildRoot%\3;%BuildRoot%\1\bin;%PATH%;%SystemDrive%\Program Files\Git\usr\bin
 cmake --build %BuildRoot%\1 --target check-swift || (exit /b)
 
+goto :eof
+endlocal
+
+:TestDispatch
+setlocal enableextensions enabledelayedexpansion
+
 :: Test dispatch
 cmake --build %BuildRoot%\3 --target ExperimentalTest || (exit /b)
 
+goto :eof
+endlocal
+
+:TestFoundation
+setlocal enableextensions enabledelayedexpansion
+
 :: NOTE(compnerd) update the path *before* the build because the tests are
 :: executed to shard the test suite.
-path %BuildRoot%\5;%BuildRoot%\4\bin;%PATH%
+path %BuildRoot%\5;%BuildRoot%\4\bin;%BuildRoot%\3;%BuildRoot%\1\bin;%PATH%;%SystemDrive%\Program Files\Git\usr\bin
 
 :: Rebuild Foundation (w/ testing)
 cmake ^
@@ -760,6 +842,16 @@ cmake --build %BuildRoot%\4 || (exit /b)
 set CTEST_OUTPUT_ON_FAILURE=1
 cmake --build %BuildRoot%\4 --target test || (exit /b)
 
+goto :eof
+endlocal
+
+:TestXCTest
+setlocal enableextensions enabledelayedexpansion
+
+:: NOTE(compnerd) update the path *before* the build because the tests are
+:: executed to shard the test suite.
+path %BuildRoot%\5;%BuildRoot%\4\bin;%BuildRoot%\3;%BuildRoot%\1\bin;%PATH%;%SystemDrive%\Program Files\Git\usr\bin
+
 :: Rebuild XCTest (w/ testing)
 cmake ^
   -B %BuildRoot%\5 ^
@@ -791,54 +883,6 @@ cmake --build %BuildRoot%\5 || (exit /b)
 :: Test XCTest
 cmake --build %BuildRoot%\5 --target check-xctest || (exit /b)
 
-:: Clean up the module cache
-rd /s /q %LocalAppData%\clang\ModuleCache
-
-goto :end
-endlocal
-
-:CloneRepositories
-setlocal enableextensions enabledelayedexpansion
-
-if defined SKIP_UPDATE_CHECKOUT goto :eof
-
-if defined REPO_SCHEME set "args=--scheme %REPO_SCHEME%"
-
-:: Always enable symbolic links
-git config --global core.symlink true
-
-:: Ensure that we have the files in the original line endings, the swift tests
-:: depend on this being the case.
-git -C "%SourceRoot%\swift" config --local core.autocrlf input
-git -C "%SourceRoot%\swift" checkout-index --force --all
-
-set "args=%args% --skip-repository swift"
-set "args=%args% --skip-repository ninja"
-set "args=%args% --skip-repository icu"
-set "args=%args% --skip-repository swift-integration-tests"
-set "args=%args% --skip-repository swift-stress-tester"
-set "args=%args% --skip-repository swift-xcode-playground-support"
-
-call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-history --github-comment "%ghprbCommentBody%"
-
-goto :eof
-endlocal
-
-:CloneDependencies
-setlocal enableextensions enabledelayedexpansion
-
-:: Always enable symbolic links
-git config --global core.symlink true
-
-:: FIXME(compnerd) avoid the fresh clone
-rd /s /q zlib libxml2 sqlite icu curl
-
-git clone --quiet --no-tags --depth 1 --branch v1.2.11 https://github.com/madler/zlib
-git clone --quiet --no-tags --depth 1 --branch v2.9.12 https://github.com/gnome/libxml2
-git clone --quiet --no-tags --depth 1 --branch version-3.36.0 https://github.com/sqlite/sqlite
-git clone --quiet --no-tags --depth 1 --branch maint/maint-69 https://github.com/unicode-org/icu
-git clone --quiet --no-tags --depth 1 --branch curl-7_77_0 https://github.com/curl/curl
-
 goto :eof
 endlocal