Skip to content

Commit 0b44f03

Browse files
committed
cmake: avoid editing t/test-lib.sh
In 7f5397a (cmake: support for testing git when building out of the source tree, 2020-06-26), we implemented support for running Git's test scripts even after building Git in a different directory than the source directory. The way we did this was to edit the file `t/test-lib.sh` to override `GIT_BUILD_DIR` to point somewhere else than the parent of the `t/` directory. This is unideal because it always leaves a tracked file marked as modified, and it is all too easy to commit that change by mistake. Let's change the strategy by teaching `t/test-lib.sh` to detect the presence of a file called `GIT-BUILD-DIR` in the source directory. If it exists, the contents are interpreted as the location to the _actual_ build directory. We then write this file as part of the CTest definition. To support building Git via a regular `make` invocation after building it using CMake, we ensure that the `GIT-BUILD-DIR` file is deleted (for convenience, this is done as part of the Makefile rule that is already run with every `make` invocation to ensure that `GIT-BUILD-OPTIONS` is up to date). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent d4d9026 commit 0b44f03

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

t/test-lib.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,16 @@ then
4242
TEST_OUTPUT_DIRECTORY=$TEST_DIRECTORY
4343
fi
4444
GIT_BUILD_DIR="${TEST_DIRECTORY%/t}"
45-
if test "$TEST_DIRECTORY" = "$GIT_BUILD_DIR"
45+
if test -f "$GIT_BUILD_DIR/GIT-BUILD-DIR"
46+
then
47+
GIT_BUILD_DIR="$(cat "$GIT_BUILD_DIR/GIT-BUILD-DIR")" || exit 1
48+
# On Windows, we must convert Windows paths lest they contain a colon
49+
case "$(uname -s)" in
50+
*MINGW*)
51+
GIT_BUILD_DIR="$(cygpath -au "$GIT_BUILD_DIR")"
52+
;;
53+
esac
54+
elif test "$TEST_DIRECTORY" = "$GIT_BUILD_DIR"
4655
then
4756
echo "PANIC: Running in a $TEST_DIRECTORY that doesn't end in '/t'?" >&2
4857
exit 1

0 commit comments

Comments
 (0)