diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-26 08:54:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-26 08:54:47 -0800 |
| commit | 93bc02f8f958085aaa41ccfa2b3cb400405b7b34 (patch) | |
| tree | 341045265cb73a11bf6341983f425f8e125fbd8a /t | |
| parent | c7c0811fd09d491cf642906f18f10eceb2066588 (diff) | |
| parent | 56090a35ab20c21ef577bd1ed2d9d5b63eb5f649 (diff) | |
| download | git-93bc02f8f958085aaa41ccfa2b3cb400405b7b34.tar.xz | |
Merge branch 'ps/gitlab-ci-macos'
CI for GitLab learned to drive macOS jobs.
* ps/gitlab-ci-macos:
ci: add macOS jobs to GitLab CI
ci: make p4 setup on macOS more robust
ci: handle TEST_OUTPUT_DIRECTORY when printing test failures
Makefile: detect new Homebrew location for ARM-based Macs
t7527: decrease likelihood of racing with fsmonitor daemon
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7527-builtin-fsmonitor.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh index 78503158fd..363f9dc0e4 100755 --- a/t/t7527-builtin-fsmonitor.sh +++ b/t/t7527-builtin-fsmonitor.sh @@ -978,7 +978,7 @@ test_expect_success !UNICODE_COMPOSITION_SENSITIVE 'Unicode nfc/nfd' ' mkdir test_unicode/nfd && mkdir test_unicode/nfd/d_${utf8_nfd} && - git -C test_unicode fsmonitor--daemon stop && + test-tool -C test_unicode fsmonitor-client query --token 0 && if test_have_prereq UNICODE_NFC_PRESERVED then |