diff options
| author | Jeff Hostetler <jeffhost@microsoft.com> | 2021-02-03 16:34:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-17 02:14:34 +0100 |
| commit | 0917763d67b99c22d980a10e94102047cc4e9a73 (patch) | |
| tree | 8d9794c175d6400b1de18ab5a33b56b01c30e843 | |
| parent | p7519: do not rely on "xargs -d" in test (diff) | |
| download | git-0917763d67b99c22d980a10e94102047cc4e9a73.tar.xz git-0917763d67b99c22d980a10e94102047cc4e9a73.zip | |
p7519: fix watchman watch-list test on Windows
Only use the final portion of the test trash directory file name
when verifying that Watchman was started.
On Windows and under the SDK, $GIT_WORKTREE is a cygwin-style
path with forward slashes and a "/c/" drive name. However
`watchman watch-list` reports a proper Windows-style pathname
with drive letters and backslashes. This causes the grep to
fail. Since we don't really care about the full pathname (and
we really don't want to bother with normalizaing them), just see
if the test-name portion of the path is found.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/perf/p7519-fsmonitor.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 6677e0ef7a..21d525541d 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -101,7 +101,7 @@ test_expect_success "one time repo setup" ' # If Watchman exists, watch the work tree and attempt a query. if test_have_prereq WATCHMAN; then watchman watch "$GIT_WORK_TREE" && - watchman watch-list | grep -q -F "$GIT_WORK_TREE" + watchman watch-list | grep -q -F "p7519-fsmonitor" fi ' |