Skip to content

build.ps1: allow building Testing, XCTest against a different SDK #84425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2025
+41 −15
Merged

build.ps1: allow building Testing, XCTest against a different SDK #84425

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 41 additions & 15 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,15 @@ param
[ValidateRange(1, 36)]
[int] $AndroidAPILevel = 28,
[string[]] $AndroidSDKVersions = @("Android", "AndroidExperimental"),
[string] $AndroidSDKVersionDefault = "Android",
[string[]] $AndroidSDKArchitectures = @("aarch64", "armv7", "i686", "x86_64"),

# Windows SDK Options
[switch] $Windows = $true,
[ValidatePattern("^\d+\.\d+\.\d+(?:-\w+)?")]
[string] $WinSDKVersion = "",
[string[]] $WindowsSDKVersions = @("Windows", "WindowsExperimental"),
[string] $WindowsSDKVersionDefault = "Windows",
[string[]] $WindowsSDKArchitectures = @("X64","X86","Arm64"),

# Incremental Build Support
Expand Down Expand Up @@ -291,6 +293,7 @@ $KnownPlatforms = @{
};
BinaryDir = "bin64a";
Cache = @{};
DefaultSDK = $WindowsSDKVersionDefault;
};

WindowsX64 = @{
Expand All @@ -304,6 +307,7 @@ $KnownPlatforms = @{
};
BinaryDir = "bin64";
Cache = @{};
DefaultSDK = $WindowsSDKVersionDefault;
};

WindowsX86 = @{
Expand All @@ -317,6 +321,7 @@ $KnownPlatforms = @{
};
BinaryDir = "bin32";
Cache = @{};
DefaultSDK = $WindowsSDKVersionDefault;
};

AndroidARMv7 = @{
Expand All @@ -330,6 +335,7 @@ $KnownPlatforms = @{
};
BinaryDir = "bin32a";
Cache = @{};
DefaultSDK = $AndroidSDKVersionDefault;
};

AndroidARM64 = @{
Expand All @@ -343,6 +349,7 @@ $KnownPlatforms = @{
};
BinaryDir = "bin64a";
Cache = @{};
DefaultSDK = $AndroidSDKVersionDefault;
};

AndroidX86 = @{
Expand All @@ -356,6 +363,7 @@ $KnownPlatforms = @{
};
BinaryDir = "bin32";
Cache = @{};
DefaultSDK = $AndroidSDKVersionDefault;
};

AndroidX64 = @{
Expand All @@ -369,6 +377,7 @@ $KnownPlatforms = @{
};
BinaryDir = "bin64";
Cache = @{};
DefaultSDK = $AndroidSDKVersionDefault;
};
}

Expand Down Expand Up @@ -3053,36 +3062,47 @@ function Build-XCTest([Hashtable] $Platform) {
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform.OS), "Developer", "Library", "XCTest-$ProductVersion", "usr"))" `
-Platform $Platform `
-UseBuiltCompilers Swift `
-SwiftSDK (Get-SwiftSDK $Platform.OS) `
-SwiftSDK (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK) `
-Defines @{
BUILD_SHARED_LIBS = "YES";
CMAKE_INSTALL_BINDIR = $Platform.BinaryDir;
ENABLE_TESTING = "NO";
dispatch_DIR = $(Get-ProjectCMakeModules $Platform Dispatch);
Foundation_DIR = $(Get-ProjectCMakeModules $Platform DynamicFoundation);
XCTest_INSTALL_NESTED_SUBDIR = "YES";
}
}

function Test-XCTest {
Invoke-IsolatingEnvVars {
$env:Path = "$(Get-ProjectBinaryCache $BuildPlatform XCTest);$(Get-ProjectBinaryCache $BuildPlatform DynamicFoundation)\bin;$(Get-ProjectBinaryCache $BuildPlatform Dispatch);$(Get-ProjectBinaryCache $BuildPlatform Runtime)\bin;${env:Path};$UnixToolsBinDir"
$SwiftRuntime = if ($BuildPlatform.DefaultSDK -match "Experimental") {
[IO.Path]::Combine((Get-InstallDir $BuildPlatform), "Runtimes", "$ProductVersion.experimental");
} else {
[IO.Path]::Combine((Get-InstallDir $BuildPlatform), "Runtimes", "$ProductVersion");
}

$DispatchBinaryCache = if ($BuildPlatform.DefaultSDK -match "Experimental") {
Get-ProjectBinaryCache $BuildPlatform ExperimentalDynamicDispatch
} else {
Get-ProjectBinaryCache $BuildPlatform Dispatch
}

$FoundationBinaryCache = if ($BuildPlatform.DefaultSDK -match "Experimental") {
Get-ProjectBinaryCache $BuildPlatform ExperimentalDynamicFoundation
} else {
Get-ProjectBinaryCache $BuildPlatform DynamicFoundation
}

$RuntimeBinaryCache = Get-ProjectBinaryCache $BuildPlatform Runtime
$SwiftRuntimeDirectory = "${RuntimeBinaryCache}\lib\swift"
$env:Path = "$(Get-ProjectBinaryCache $BuildPlatform XCTest);${FoundationBinaryCache}\bin;${DispatchBinaryCache};${SwiftRuntime}\usr\bin;${env:Path};$UnixToolsBinDir"
$env:SDKROOT = Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK

Build-CMakeProject `
-Src $SourceCache\swift-corelibs-xctest `
-Bin (Get-ProjectBinaryCache $BuildPlatform XCTest) `
-Platform $BuildPlatform `
-UseBuiltCompilers C,CXX,Swift `
-SwiftSDK $null `
-SwiftSDK (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK) `
-BuildTargets default,check-xctest `
-Defines @{
CMAKE_Swift_FLAGS = @("-resource-dir", $SwiftRuntimeDirectory, "-vfsoverlay", "${RuntimeBinaryCache}\stdlib\windows-vfs-overlay.yaml");
ENABLE_TESTING = "YES";
dispatch_DIR = $(Get-ProjectCMakeModules $BuildPlatform Dispatch);
Foundation_DIR = $(Get-ProjectCMakeModules $BuildPlatform DynamicFoundation);
LLVM_DIR = "$(Get-ProjectBinaryCache $BuildPlatform LLVM)\lib\cmake\llvm";
XCTEST_PATH_TO_FOUNDATION_BUILD = $(Get-ProjectBinaryCache $BuildPlatform DynamicFoundation);
XCTEST_PATH_TO_LIBDISPATCH_BUILD = $(Get-ProjectBinaryCache $BuildPlatform Dispatch);
Expand All @@ -3098,12 +3118,10 @@ function Build-Testing([Hashtable] $Platform) {
-InstallTo "$([IO.Path]::Combine((Get-PlatformRoot $Platform.OS), "Developer", "Library", "Testing-$ProductVersion", "usr"))" `
-Platform $Platform `
-UseBuiltCompilers CXX,Swift `
-SwiftSDK (Get-SwiftSDK $Platform.OS) `
-SwiftSDK (Get-SwiftSDK -OS $Platform.OS -Identifier $Platform.DefaultSDK) `
-Defines @{
BUILD_SHARED_LIBS = "YES";
CMAKE_INSTALL_BINDIR = $Platform.BinaryDir;
dispatch_DIR = (Get-ProjectCMakeModules $Platform Dispatch);
Foundation_DIR = (Get-ProjectCMakeModules $Platform DynamicFoundation);
SwiftTesting_MACRO = "$(Get-ProjectBinaryCache $BuildPlatform BootstrapTestingMacros)\TestingMacros.dll";
SwiftTesting_INSTALL_NESTED_SUBDIR = "YES";
}
Expand Down Expand Up @@ -3164,8 +3182,6 @@ function Build-SDK([Hashtable] $Platform) {
Invoke-BuildStep Build-Dispatch $Platform
Invoke-BuildStep Build-Foundation $Platform
Invoke-BuildStep Build-CompilerRuntime $Platform
Invoke-BuildStep Build-XCTest $Platform
Invoke-BuildStep Build-Testing $Platform
}

function Build-ExperimentalSDK([Hashtable] $Platform) {
Expand Down Expand Up @@ -4092,6 +4108,11 @@ if (-not $SkipBuild) {
}
}

foreach ($Build in $WindowsSDKBuilds) {
Invoke-BuildStep Build-XCTest $Build
Invoke-BuildStep Build-Testing $Build
}

Write-PlatformInfoPlist Windows
}

Expand Down Expand Up @@ -4145,6 +4166,11 @@ if (-not $SkipBuild) {
}
}

foreach ($Build in $AndroidSDKBuilds) {
Invoke-BuildStep Build-XCTest $Build
Invoke-BuildStep Build-Testing $Build
}

Write-PlatformInfoPlist Android

# Android swift-inspect only supports 64-bit platforms.
Expand Down