diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-27 14:51:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-27 14:51:53 -0700 |
| commit | 246eedf2bc38bf563fbb39e4ce9aaa1ff4a62573 (patch) | |
| tree | 3717285422abc34fbe6babff10a417075c306ff1 /t | |
| parent | 702bb4baea0da4d283afd956be5a1e28915f5f9f (diff) | |
| parent | c858750b41ca9ea1c614dcc8d0c50f702d1e13b4 (diff) | |
| download | git-246eedf2bc38bf563fbb39e4ce9aaa1ff4a62573.tar.gz | |
Merge branch 'js/cmake-updates'
Update to build procedure with VS using CMake/CTest.
* js/cmake-updates:
cmake: increase time-out for a long-running test
cmake: avoid editing t/test-lib.sh
add -p: avoid ambiguous signed/unsigned comparison
cmake: copy the merge tools for testing
cmake: make it easier to diagnose regressions in CTest runs
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 6ca68311eb..6db377f68b 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -47,6 +47,16 @@ then echo "PANIC: Running in a $TEST_DIRECTORY that doesn't end in '/t'?" >&2 exit 1 fi +if test -f "$GIT_BUILD_DIR/GIT-BUILD-DIR" +then + GIT_BUILD_DIR="$(cat "$GIT_BUILD_DIR/GIT-BUILD-DIR")" || exit 1 + # On Windows, we must convert Windows paths lest they contain a colon + case "$(uname -s)" in + *MINGW*) + GIT_BUILD_DIR="$(cygpath -au "$GIT_BUILD_DIR")" + ;; + esac +fi # Prepend a string to a VAR using an arbitrary ":" delimiter, not # adding the delimiter if VAR or VALUE is empty. I.e. a generalized: |