X Tutup
Skip to content

Add additional platform check for Windows before launching native app. #19812

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
daxian-dbw merged 4 commits into from
Jun 19, 2023
Merged

Add additional platform check for Windows before launching native app. #19812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3212c5
Add additional platform check for Windows before launching native app.
JamesWTruher Jun 15, 2023
9fb9768
Add test for not getting cursor position.
JamesWTruher Jun 15, 2023
da5116a
Use #if rather than runtime check to determine whether we can screen …
JamesWTruher Jun 16, 2023
165cee2
Update invocation of 'Set-ItResult'
JamesWTruher Jun 19, 2023
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
4 changes: 4 additions & 0 deletions src/System.Management.Automation/engine/NativeCommandProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,9 @@ private void CalculateIORedirection(bool isWindowsApplication, out bool redirect
{
if (s_supportScreenScrape == null)
{
#if UNIX
s_supportScreenScrape = false;
#else
try
{
_startPosition = this.Command.Context.EngineHostInterface.UI.RawUI.CursorPosition;
Expand All @@ -1704,6 +1707,7 @@ private void CalculateIORedirection(bool isWindowsApplication, out bool redirect
{
s_supportScreenScrape = false;
}
#endif
}

// if screen scraping isn't supported, we enable redirection so that the output is still transcribed
Expand Down
25 changes: 25 additions & 0 deletions test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,3 +366,28 @@ Describe "Run native command from a mounted FAT-format VHD" -tags @("Feature", "
$result | Should -BeExactly $expected
}
}

Describe "Native application invocation and getting cursor position" -Tags 'CI' {
It "Invoking a native application should not collect the cursor position" -Skip:($IsWindows) {
$expectCmd = Get-Command expect -Type Application -ErrorAction Ignore
$dateCmd = Get-Command date -Type Application -ErrorAction Ignore
# if date or expect are missing mark the test as pending
# test setup will need to ensure that these programs are present.
$missing = @()
if ($null -eq $expectCmd) {
$missing += "expect"
}
if ($null -eq $dateCmd) {
$missing += "date"
}
if ($missing.count -ne 0) {
$message = "missing command(s) {0}" -f ($missing -join ", ")
Set-ItResult -Pending -Because $message
}

$powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
$commandString = "spawn $powershell -nopro -c /bin/date; expect eof"
[string]$result = expect -c $commandString
$result.IndexOf("`e[6n") | Should -Be -1 -Because $result.replace("`e","``e").replace("`u{7}","<BELL>")
}
}
X Tutup