Skip to content

Commit cc8f09b

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 ebf3c04 commit cc8f09b

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2826,6 +2826,11 @@ ifdef GIT_TEST_INDEX_VERSION
28262826
endif
28272827
ifdef GIT_TEST_PERL_FATAL_WARNINGS
28282828
@echo GIT_TEST_PERL_FATAL_WARNINGS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_PERL_FATAL_WARNINGS)))'\' >>$@+
2829+
endif
2830+
ifdef RUNTIME_PREFIX
2831+
@echo RUNTIME_PREFIX=\'true\' >>$@+
2832+
else
2833+
@echo RUNTIME_PREFIX=\'false\' >>$@+
28292834
endif
28302835
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
28312836

t/t0060-path-utils.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,4 +525,22 @@ test_expect_success MINGW 'is_valid_path() on Windows' '
525525
"PRN./abc"
526526
'
527527

528+
test_lazy_prereq RUNTIME_PREFIX '
529+
test true = "$RUNTIME_PREFIX"
530+
'
531+
532+
test_lazy_prereq CAN_EXEC_IN_PWD '
533+
cp "$GIT_EXEC_PATH"/git$X ./ &&
534+
./git rev-parse
535+
'
536+
537+
test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
538+
mkdir -p pretend/bin pretend/libexec/git-core &&
539+
echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
540+
cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
541+
GIT_EXEC_PATH= ./pretend/bin/git here >actual &&
542+
echo HERE >expect &&
543+
test_cmp expect actual
544+
'
545+
528546
test_done

0 commit comments

Comments
 (0)