Don't kill the test process during cleanup#40503
Merged
Merged
Conversation
benhillis
approved these changes
May 11, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Prevents TAEF’s test host from being terminated during shutdown by avoiding closing a job object that has KILL_ON_JOB_CLOSE set.
Changes:
- Removes the global
wil::unique_handlejob handle so it won’t be auto-closed during cleanup. - Creates a job object as a raw
HANDLEand intentionally leaks it to keep the host alive through shutdown while still usingKILL_ON_JOB_CLOSE.
Comment on lines
+1982
to
+1990
| // N.B. When the job object is closed, all processes associated with the job will be terminated. | ||
| // Because of that, we're purposefully leaking this job object so we don't kill the test process on cleanup. | ||
| auto job = CreateJobObjectW(nullptr, nullptr); | ||
| THROW_LAST_ERROR_IF(!job); | ||
|
|
||
| JOBOBJECT_EXTENDED_LIMIT_INFORMATION jobInfo{}; | ||
| jobInfo.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE; | ||
| THROW_IF_WIN32_BOOL_FALSE(SetInformationJobObject(g_processJob.get(), JobObjectExtendedLimitInformation, &jobInfo, sizeof(jobInfo))); | ||
| THROW_IF_WIN32_BOOL_FALSE(AssignProcessToJobObject(g_processJob.get(), GetCurrentProcess())); | ||
| THROW_IF_WIN32_BOOL_FALSE(SetInformationJobObject(job, JobObjectExtendedLimitInformation, &jobInfo, sizeof(jobInfo))); | ||
| THROW_IF_WIN32_BOOL_FALSE(AssignProcessToJobObject(job, GetCurrentProcess())); |
| @@ -70,7 +70,6 @@ std::wstring g_testDistroPath; | |||
| std::wstring g_testDataPath; | |||
| bool g_fastTestRun = false; // True when test.bat was invoked with -f | |||
| static wil::unique_mta_usage_cookie g_mtaCookie; | |||
Comment on lines
+1982
to
+1985
| // N.B. When the job object is closed, all processes associated with the job will be terminated. | ||
| // Because of that, we're purposefully leaking this job object so we don't kill the test process on cleanup. | ||
| auto job = CreateJobObjectW(nullptr, nullptr); | ||
| THROW_LAST_ERROR_IF(!job); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary of the Pull Request
This change fixes the following warning when the tests complete:
See comment for details
PR Checklist
Detailed Description of the Pull Request / Additional comments
Validation Steps Performed