Skip to content

Commit 8121258

Browse files
committed
Cleanup temporary files after tests
1 parent f5870b6 commit 8121258

File tree

4 files changed

+19
-3
lines changed

4 files changed

+19
-3
lines changed

extension/BuildPhpExtension/BuildPhpExtension.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
# NestedModules = @()
6161

6262
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
63-
FunctionsToExport = 'Invoke-PhpBuildExtension', 'Add-BuildRequirements', 'Add-Path', 'Get-PhpSdk', 'Add-Dependencies', 'Add-PhpDependencies', 'Get-VsVersion', 'Add-Extension', 'Get-Extension', 'Get-BuildDirectory', 'Get-ExtensionSource', 'Add-ExtensionDependencies', 'Add-BuildTools', 'Add-OciSdk', 'Add-OdbcCli', 'Get-ExtensionConfig', 'Add-Extensions', 'Get-PhpBuild', 'Get-PhpBuildDetails', 'Invoke-Build', 'Invoke-Tests', 'Add-Package', 'Get-PhpDevelBuild', 'Get-OlderVsVersion', 'Get-PeclLibraryZip', 'Add-BuildLog', 'Add-StepLog', 'Set-GAGroup'
63+
FunctionsToExport = 'Invoke-PhpBuildExtension', 'Add-BuildRequirements', 'Add-Path', 'Get-PhpSdk', 'Add-Dependencies', 'Add-PhpDependencies', 'Get-VsVersion', 'Add-Extension', 'Get-Extension', 'Get-BuildDirectory', 'Get-ExtensionSource', 'Add-ExtensionDependencies', 'Add-BuildTools', 'Add-OciSdk', 'Add-OdbcCli', 'Get-ExtensionConfig', 'Add-Extensions', 'Get-PhpBuild', 'Get-PhpBuildDetails', 'Invoke-Build', 'Invoke-Tests', 'Add-Package', 'Get-PhpDevelBuild', 'Get-OlderVsVersion', 'Get-PeclLibraryZip', 'Add-BuildLog', 'Add-StepLog', 'Set-GAGroup', 'Invoke-CleanupTempFiles', 'Get-TempFiles'
6464

6565
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
6666
CmdletsToExport = '*'
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Function Get-TempFiles {
2+
$script:initialSystemState = Get-ChildItem -Path "C:\Windows\Temp" -Recurse -File | Select-Object FullName
3+
$script:initialUserState = Get-ChildItem -Path $env:TEMP -Recurse -File | Select-Object FullName
4+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Function Invoke-CleanupTempFiles {
2+
$currentSystemState = Get-ChildItem -Path "C:\Windows\Temp" -Recurse -File | Select-Object FullName
3+
$currentUserState = Get-ChildItem -Path $env:TEMP -Recurse -File | Select-Object FullName
4+
5+
$newSystemFiles = Compare-Object -ReferenceObject $script:initialSystemState -DifferenceObject $currentSystemState -Property FullName | Where-Object {$_.SideIndicator -eq "=>"}
6+
$newUserFiles = Compare-Object -ReferenceObject $script:initialUserState -DifferenceObject $currentUserState -Property FullName | Where-Object {$_.SideIndicator -eq "=>"}
7+
$newSystemFiles + $newUserFiles | ForEach-Object {
8+
Remove-Item -Path $_.FullName -Force
9+
}
10+
}

extension/BuildPhpExtension/private/Invoke-Tests.ps1

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Function Invoke-Tests {
2020
$env:REPORT_EXIT_STATUS = 1
2121
$env:XDEBUG_MODE = ""
2222
$tempOriginal = $env:TEMP
23+
Get-TempFiles
2324
$type='extension'
2425
if ((Select-String -Path 'config.w32' -Pattern 'ZEND_EXTENSION\(' -Quiet) -eq $true) {
2526
$type='zend_extension'
@@ -87,10 +88,11 @@ Function Invoke-Tests {
8788
if ($LASTEXITCODE -ne 0) {
8889
$success = $False
8990
}
91+
$env:TEMP = $tempOriginal
92+
$env:TMP = $tempOriginal
93+
Invoke-CleanupTempFiles
9094
Set-GAGroup end
9195
}
92-
$env:TEMP = $tempOriginal
93-
$env:TMP = $tempOriginal
9496
if(-not $success) {
9597
throw "Failed to run tests successfully"
9698
}

0 commit comments

Comments
 (0)