From c14e2b2bb0f56af1d8170fa0a2cd4d710cf3ac83 Mon Sep 17 00:00:00 2001
From: Alex Hoppen <ahoppen@apple.com>
Date: Tue, 15 Oct 2024 22:34:49 -0700
Subject: [PATCH] WIP

---
 utils/build-windows-toolchain.bat                        | 6 ++++--
 utils/build.ps1                                          | 3 ++-
 utils/update_checkout/update_checkout/update_checkout.py | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/utils/build-windows-toolchain.bat b/utils/build-windows-toolchain.bat
index 42f3309fe895f..f6cd11b1c776c 100644
--- a/utils/build-windows-toolchain.bat
+++ b/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= )
 
diff --git a/utils/build.ps1 b/utils/build.ps1
index 05b9e9f115295..8ea9620b30bfc 100644
--- a/utils/build.ps1
+++ b/utils/build.ps1
@@ -1251,7 +1251,8 @@ function Build-SPMProject {
         "-Xbuild-tools-swiftc", "-I$SDKInstallRoot\usr\lib\swift",
         "-Xbuild-tools-swiftc", "-L$SDKInstallRoot\usr\lib\swift\windows",
         "-Xcc", "-I$SDKInstallRoot\usr\lib\swift",
-        "-Xlinker", "-L$SDKInstallRoot\usr\lib\swift\windows"
+        "-Xlinker", "-L$SDKInstallRoot\usr\lib\swift\windows",
+        "--verbose"
     )
     if ($DebugInfo) {
       if ($SwiftDebugFormat -eq "dwarf") {
diff --git a/utils/update_checkout/update_checkout/update_checkout.py b/utils/update_checkout/update_checkout/update_checkout.py
index 01cb9dd0e38be..162f6f5b7e859 100755
--- a/utils/update_checkout/update_checkout/update_checkout.py
+++ b/utils/update_checkout/update_checkout/update_checkout.py
@@ -244,6 +244,8 @@ def run_for_repo_and_each_submodule_rec(cmd):
                 full_target = full_target_name('origin', checkout_target)
                 shell.run(['git', 'reset', '--hard', full_target],
                           echo=True, prefix=prefix)
+                shell.run(['git', 'status'],
+                          echo=True, prefix=prefix)
                 return
 
             # Query whether we have a "detached HEAD", which will mean that