File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed
packages/flutter_tools/test/integration.shard Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -83,18 +83,21 @@ Catch {
83
83
$ProgressPreference = $OriginalProgressPreference
84
84
}
85
85
86
- Write-Host " Expanding downloaded archive..."
87
86
If (Get-Command 7z - errorAction SilentlyContinue) {
87
+ Write-Host " Expanding downloaded archive with 7z..."
88
88
# The built-in unzippers are painfully slow. Use 7-Zip, if available.
89
89
& 7z x $dartSdkZip " -o$cachePath " - bd | Out-Null
90
90
} ElseIf (Get-Command 7za - errorAction SilentlyContinue) {
91
+ Write-Host " Expanding downloaded archive with 7za..."
91
92
# Use 7-Zip's standalone version 7za.exe, if available.
92
93
& 7za x $dartSdkZip " -o$cachePath " - bd | Out-Null
93
94
} ElseIf (Get-Command Microsoft.PowerShell.Archive\Expand-Archive - errorAction SilentlyContinue) {
95
+ Write-Host " Expanding downloaded archive with PowerShell..."
94
96
# Use PowerShell's built-in unzipper, if available (requires PowerShell 5+).
95
97
$global :ProgressPreference = ' SilentlyContinue'
96
98
Microsoft.PowerShell.Archive\Expand-Archive $dartSdkZip - DestinationPath $cachePath
97
99
} Else {
100
+ Write-Host " Expanding downloaded archive with Windows..."
98
101
# As last resort: fall back to the Windows GUI.
99
102
$shell = New-Object - com shell.application
100
103
$zip = $shell.NameSpace ($dartSdkZip )
Original file line number Diff line number Diff line change @@ -49,7 +49,8 @@ Future<void> main() async {
49
49
// See: https://github.com/flutter/flutter/issues/132592
50
50
expect (dartSdkStamp.existsSync (), true );
51
51
expect (output, contains ('Downloading Dart SDK from Flutter engine ...' ));
52
- expect (output, contains ('Expanding downloaded archive...' ));
52
+ // Do not assert on the exact unzipping method, as this could change on CI
53
+ expect (output, contains (RegExp (r'Expanding downloaded archive with (.*)...' )));
53
54
expect (output, isNot (contains ('Use the -Force parameter' /* Luke */ )));
54
55
},
55
56
skip: ! platform.isWindows); // [intended] Only Windows uses the batch entrypoint
You can’t perform that action at this time.
0 commit comments