Merge pull request #71341 from compnerd/swiftpm

utils: add support for testing self-hosted SPM

Author: compnerd

utils/build.ps1

@@ -780,6 +780,7 @@ function Build-SPMProject {
     [string] $Src,
     [string] $Bin,
     [hashtable] $Arch,
+    [switch] $Test = $false,
     [Parameter(ValueFromRemainingArguments)]
     [string[]] $AdditionalArguments
   )
@@ -816,7 +817,8 @@ function Build-SPMProject {
       $Arguments += @("-debug-info-format", "none")
     }
 
-    Invoke-Program "$ToolchainInstallRoot\usr\bin\swift.exe" "build" @Arguments @AdditionalArguments
+    $Action = if ($Test) { "test" } else { "build" }
+    Invoke-Program "$ToolchainInstallRoot\usr\bin\swift.exe" $Action @Arguments @AdditionalArguments
   }
 
   if (-not $ToBatch) {
@@ -1601,14 +1603,14 @@ function Build-Certificates($Arch) {
 }
 
 function Build-PackageManager($Arch) {
-  $SrcPath = "$SourceCache\swift-package-manager"
-  if (-not (Test-Path -PathType Container $SrcPath)) {
-    # The Apple CI clones this repo as "swiftpm"
-    $SrcPath = "$SourceCache\swiftpm"
+  $SrcDir = if (Test-Path -Path "$SourceCache\swift-package-manager" -PathType Container) {
+    "$SourceCache\swift-package-manager"
+  } else {
+    "$SourceCache\swiftpm"
   }
 
   Build-CMakeProject `
-    -Src $SrcPath `
+    -Src $SrcDir `
     -Bin $BinaryCache\12 `
     -InstallTo "$($Arch.ToolchainInstallRoot)\usr" `
     -Arch $Arch `
@@ -1749,6 +1751,25 @@ function Build-DocC() {
   }
 }
 
+function Test-PackageManager() {
+  $OutDir = Join-Path -Path $HostArch.BinaryCache -ChildPath swift-package-manager
+  $SrcDir = if (Test-Path -Path "$SourceCache\swift-package-manager" -PathType Container) {
+    "$SourceCache\swift-package-manager"
+  } else {
+    "$SourceCache\swiftpm"
+  }
+
+  Isolate-EnvVars {
+    $env:SWIFTCI_USE_LOCAL_DEPS=1
+    Build-SPMProject `
+      -Test `
+      -Src $SrcDir `
+      -Bin $OutDir `
+      -Arch $HostArch `
+      -Xcc -Xclang -Xcc -fno-split-cold-code -Xcc "-I$LibraryRoot\sqlite-3.43.2\usr\include" -Xlinker "-L$LibraryRoot\sqlite-3.43.2\usr\lib"
+  }
+}
+
 function Build-Installer($Arch) {
   $Properties = @{
     BundleFlavor = "offline";
@@ -1900,6 +1921,7 @@ if ($Test -contains "dispatch") { Build-Dispatch $HostArch -Test }
 if ($Test -contains "foundation") { Build-Foundation $HostArch -Test }
 if ($Test -contains "xctest") { Build-XCTest $HostArch -Test }
 if ($Test -contains "llbuild") { Build-LLBuild $HostArch -Test }
+if ($Test -contains "swiftpm") { Test-PackageManager $HostArch }
 
 # Custom exception printing for more detailed exception information
 } catch {