Skip to content

Commit a7aa7c4

Browse files
committed
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 d2fbd73 commit a7aa7c4

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
@@ -2756,6 +2756,11 @@ ifdef GIT_TEST_INDEX_VERSION
27562756
endif
27572757
ifdef GIT_TEST_PERL_FATAL_WARNINGS
27582758
@echo GIT_TEST_PERL_FATAL_WARNINGS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_PERL_FATAL_WARNINGS)))'\' >>$@+
2759+
endif
2760+
ifdef RUNTIME_PREFIX
2761+
@echo RUNTIME_PREFIX=\'true\' >>$@+
2762+
else
2763+
@echo RUNTIME_PREFIX=\'false\' >>$@+
27592764
endif
27602765
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
27612766

t/t0060-path-utils.sh

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

519536
test_done

0 commit comments

Comments
 (0)