WIP

Author: ahoppen

utils/build-windows-toolchain.bat

@@ -10,6 +10,8 @@
 
 setlocal enableextensions enabledelayedexpansion
 
+SET
+
 :: Work around CI invocation in vsdevcmd
 :: The build relies on build.ps1, which should not be called in a vs dev cmd
 if "%VSCMD_ARG_HOST_ARCH%"=="" goto Start
@@ -57,10 +59,10 @@ set TEMP=%BuildRoot%\tmp
 set TMP=%BuildRoot%\tmp
 set TMPDIR=%BuildRoot%\tmp
 
-set NINJA_STATUS=[%%f/%%t][%%p][%%es] 
+set NINJA_STATUS=[%%f/%%t][%%p][%%es]
 
 :: Build the -Test argument, if any, by subtracting skipped tests
-set TestArg=-Test lld,swift,dispatch,foundation,xctest,
+set TestArg=-Test lld,swift,dispatch,foundation,xctest,swift-format,
 for %%I in (%SKIP_TESTS%) do (call set TestArg=%%TestArg:%%I,=%%)
 if "%TestArg:~-1%"=="," (set TestArg=%TestArg:~0,-1%) else (set TestArg= )
 
@@ -89,8 +91,6 @@ 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
@@ -106,6 +106,7 @@ set "args=%args% --skip-repository ninja"
 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"
+set "args=%args% --skip-repository %GIT_CHECKOUT_DIR%"
 
 call "%SourceRoot%\swift\utils\update-checkout.cmd" %args% --clone --skip-history --reset-to-remote --github-comment "%ghprbCommentBody%"