Skip to content

Fix macos test discovery, update stale env var with process.env vars #2096

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
TheAngryByrd merged 1 commit into from
Jul 19, 2025
Merged

Fix macos test discovery, update stale env var with process.env vars #2096

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
24 changes: 10 additions & 14 deletions src/Components/TestExplorer.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,14 @@ module DotnetCli =
let argString = String.Join(" ", args)
logger.Debug($"Running `dotnet {argString}`")

let getEnv enableTestHostDebugger =
let parentEnv = Node.Api.``process``.env
let childEnv = parentEnv
//NOTE: Important to include VSTEST_HOST_DEBUG=0 when not debugging to remove stale values
// that may cause the debugger to wait and hang
childEnv?VSTEST_HOST_DEBUG <- (if enableTestHostDebugger then 1 else 0)
childEnv |> box |> Some

match shouldDebug with
| Debug ->
let mutable isDebuggerStarted = false
Expand All @@ -571,20 +579,8 @@ module DotnetCli =
launchDebugger processId
isDebuggerStarted <- true

let env =
let parentEnv = Node.Api.``process``.env
let childEnv = parentEnv
childEnv?VSTEST_HOST_DEBUG <- 1
childEnv |> box |> Some

Process.execWithCancel "dotnet" (ResizeArray(args)) env tryLaunchDebugger cancellationToken
| NoDebug ->
let env =
let staleOverrides = {| VSTEST_HOST_DEBUG = 0 |}
staleOverrides |> box |> Some

Process.execWithCancel "dotnet" (ResizeArray(args)) env ignore cancellationToken

Process.execWithCancel "dotnet" (ResizeArray(args)) (getEnv true) tryLaunchDebugger cancellationToken
| NoDebug -> Process.execWithCancel "dotnet" (ResizeArray(args)) (getEnv false) ignore cancellationToken

type TrxPath = string
type ConsoleOutput = string
Expand Down
Loading