Skip to content

Prepare the gc tests for v3.x of the MSYS2 runtime #2180

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.

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
merged 1 commit into from
May 6, 2019

Conversation

dscho
Copy link
Member

@dscho dscho commented May 5, 2019

It was always a tricky thing to run Git's scripts with MSYS2 while insisting on running the rest via the non-MSYS2 git.exe.

With v3.x of the MSYS2 runtime, this became even trickier, as it now seems that the Cygwin/MSYS2 process IDs no longer are actual Windows process IDs anymore. Or at least git.exe cannot open those processes (and wmic process list seems not to list them, either).

This PR fixes the (as far as I can tell) only test case that relied on this previously.

In Git for Windows, we use the MSYS2 Bash which inherits a non-standard
PID model from Cygwin's POSIX emulation layer: every MSYS2 process has a
regular Windows PID, and in addition it has an MSYS2 PID (which
corresponds to a shadow process that emulates Unix-style signal
handling).

With the upgrade to the MSYS2 runtime v3.x, this shadow process cannot
be accessed via `OpenProcess()` any longer, and therefore t6500 thought
incorrectly that the process referenced in `gc.pid` (which is not
actually a real `gc` process in this context, but the current shell) no
longer exists.

Let's fix this by making sure that the Windows PID is written into
`gc.pid` in this test script soo that `git.exe` is able to understand
that that process does indeed still exist.

Signed-off-by: Johannes Schindelin <[email protected]>
@dscho dscho merged commit 3a29b23 into git-for-windows:master May 6, 2019
@dscho dscho deleted the t6500-and-msys2-runtime-v3.x branch May 6, 2019 19:44
@dscho dscho restored the t6500-and-msys2-runtime-v3.x branch May 6, 2019 19:47
@dscho dscho added this to the v2.21.0(2) milestone May 6, 2019
dscho added a commit that referenced this pull request May 7, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 7, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
git-for-windows-ci pushed a commit that referenced this pull request May 8, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 8, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 9, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 9, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 9, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
git-for-windows-ci pushed a commit that referenced this pull request May 9, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 10, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 10, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 10, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
git-for-windows-ci pushed a commit that referenced this pull request May 10, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
git-for-windows-ci pushed a commit that referenced this pull request May 10, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
git-for-windows-ci pushed a commit that referenced this pull request May 10, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 13, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 13, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit to dscho/git that referenced this pull request May 13, 2019
…ntime-v3.x

Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit to dscho/git that referenced this pull request May 13, 2019
…ntime-v3.x

Prepare the gc tests for v3.x of the MSYS2 runtime
git-for-windows-ci pushed a commit that referenced this pull request May 14, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 14, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
@dscho dscho deleted the t6500-and-msys2-runtime-v3.x branch May 20, 2019 10:26
dscho added a commit that referenced this pull request May 21, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 22, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request May 25, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request Jun 4, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
dscho added a commit that referenced this pull request Jun 8, 2019
Prepare the gc tests for v3.x of the MSYS2 runtime
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant