Skip to content

Commit 4e971a4

Browse files
authored
Merge pull request #71378 from compnerd/summary
utils: gussy up timing information summary for Windows
2 parents 93b68cd + 485ff3e commit 4e971a4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

utils/build.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ function Build-CMakeProject {
767767
if ($Summary) {
768768
$TimingData.Add([PSCustomObject]@{
769769
Arch = $Arch.ShortName
770-
Checkout = $Src
770+
Checkout = $Src.Replace($SourceCache, '')
771771
BuildID = Split-Path -Path $Bin -Leaf
772772
"Elapsed Time" = $Stopwatch.Elapsed.ToString()
773773
})
@@ -829,7 +829,7 @@ function Build-SPMProject {
829829
if ($Summary) {
830830
$TimingData.Add([PSCustomObject]@{
831831
Arch = $Arch.ShortName
832-
Checkout = $Src
832+
Checkout = $Src.Replace($SourceCache, '')
833833
BuildID = Split-Path -Path $Bin -Leaf
834834
"Elapsed Time" = $Stopwatch.Elapsed.ToString()
835835
})
@@ -1902,10 +1902,6 @@ if ($Stage) {
19021902
Stage-BuildArtifacts $HostArch
19031903
}
19041904

1905-
if ($Summary) {
1906-
$TimingData | Select Arch,Checkout,BuildID,"Elapsed Time" | Sort -Descending -Property "Elapsed Time" | Format-Table -AutoSize
1907-
}
1908-
19091905
if ($Test -ne $null -and (Compare-Object $Test @("clang", "lld", "lldb", "llvm", "swift") -PassThru -IncludeEqual -ExcludeDifferent) -ne $null) {
19101906
$Tests = @{
19111907
"-TestClang" = $Test -contains "clang";
@@ -1949,4 +1945,8 @@ if ($Test -contains "swiftpm") { Test-PackageManager $HostArch }
19491945
}
19501946

19511947
exit 1
1948+
} finally {
1949+
if ($Summary) {
1950+
$TimingData | Select Arch,Checkout,BuildID,"Elapsed Time" | Sort -Descending -Property "Elapsed Time" | Format-Table -AutoSize
1951+
}
19521952
}

0 commit comments

Comments
 (0)