Skip to content

Commit 74b99b7

Browse files
dschoGit for Windows Build Agent
authored andcommitted
tests: exercise the RUNTIME_PREFIX feature
Originally, we refrained from adding a regression test in 7b6c649 (system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set, 2008-08-10), and in 226c0dd (exec_cmd: RUNTIME_PREFIX on some POSIX systems, 2018-04-10). The reason was that it was deemed too tricky to test. Turns out that it is not tricky to test at all: we simply create a pseudo-root, copy the `git` executable into the `git/` subdirectory of that pseudo-root, then copy a script into the `libexec/git-core/` directory and expect that to be picked up. As long as the trash directory is in a location where binaries can be executed, this works. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 2b60db0 commit 74b99b7

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,6 +2720,11 @@ ifdef GIT_INTEROP_MAKE_OPTS
27202720
endif
27212721
ifdef GIT_TEST_INDEX_VERSION
27222722
@echo GIT_TEST_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_INDEX_VERSION)))'\' >>$@+
2723+
endif
2724+
ifdef RUNTIME_PREFIX
2725+
@echo RUNTIME_PREFIX=\'true\' >>$@+
2726+
else
2727+
@echo RUNTIME_PREFIX=\'false\' >>$@+
27232728
endif
27242729
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
27252730

t/t0060-path-utils.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,23 @@ test_expect_success MINGW 'MSYSTEM/PATH is adjusted if necessary' '
512512
test_write_lines MSYSTEM=$MSYSTEM mingw64 usr >expect &&
513513
test_cmp expect actual
514514
'
515+
516+
test_lazy_prereq RUNTIME_PREFIX '
517+
test true = "$RUNTIME_PREFIX"
518+
'
519+
520+
test_lazy_prereq CAN_EXEC_IN_PWD '
521+
cp "$GIT_EXEC_PATH"/git$X ./ &&
522+
./git rev-parse
523+
'
524+
525+
test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
526+
mkdir -p pretend/git pretend/libexec/git-core &&
527+
echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
528+
cp "$GIT_EXEC_PATH"/git$X pretend/git/ &&
529+
GIT_EXEC_PATH= ./pretend/git/git here >actual &&
530+
echo HERE >expect &&
531+
test_cmp expect actual
515532
'
516533

517534
test_done

0 commit comments

Comments
 (0)