From 04f3200723d67aaf5d46106c5c5602a0d5caae94 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Sat, 7 Oct 2023 11:40:01 -0400 Subject: [PATCH] Ask git where its daemon is and use that This changes the test helpers on Windows to use "git --exec-path" (with whatever "git" GitPython is using) to find the directory that contains "git-daemon.exe", instead of finding it in a PATH search. --- README.md | 3 --- test/lib/helper.py | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 69fb54c9f..b9e61912a 100644 --- a/README.md +++ b/README.md @@ -121,9 +121,6 @@ _Important_: Right after cloning this repository, please be sure to have execute the `./init-tests-after-clone.sh` script in the repository root. Otherwise you will encounter test failures. -On _Windows_, make sure you have `git-daemon` in your PATH. For MINGW-git, the `git-daemon.exe` -exists in `Git\mingw64\libexec\git-core\`. - #### Install test dependencies Ensure testing libraries are installed. This is taken care of already if you installed with: diff --git a/test/lib/helper.py b/test/lib/helper.py index 1de904610..d415ba2e7 100644 --- a/test/lib/helper.py +++ b/test/lib/helper.py @@ -182,7 +182,7 @@ def git_daemon_launched(base_path, ip, port): # and then CANNOT DIE! # So, invoke it as a single command. daemon_cmd = [ - "git-daemon", + osp.join(Git()._call_process("--exec-path"), "git-daemon"), "--enable=receive-pack", "--listen=%s" % ip, "--port=%s" % port,