git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-29 02:53:45 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

fixup! tests: exercise the RUNTIME_PREFIX feature

Browse Source 
This drops the original patch in preparation for merging the version
that made it upstream.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2021-10-15 14:11:20 +02:00
parent c7d0a86b02
commit 81b29dedd5
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -2888,11 +2888,6 @@ ifdef GIT_TEST_INDEX_VERSION
endif
ifdef GIT_TEST_PERL_FATAL_WARNINGS
@echo GIT_TEST_PERL_FATAL_WARNINGS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_PERL_FATAL_WARNINGS)))'\' >>$@+
endif
ifdef RUNTIME_PREFIX
@echo RUNTIME_PREFIX=\'true\' >>$@+
else
@echo RUNTIME_PREFIX=\'false\' >>$@+
endif
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi

17
t/t0060-path-utils.sh
View File

@@ -544,23 +544,6 @@ test_expect_success MINGW 'MSYSTEM/PATH is adjusted if necessary' '
test_write_lines MSYSTEM=$MSYSTEM mingw64 usr >expect &&
test_cmp expect actual
'
test_lazy_prereq RUNTIME_PREFIX '
test true = "$RUNTIME_PREFIX"
'
test_lazy_prereq CAN_EXEC_IN_PWD '
cp "$GIT_EXEC_PATH"/git$X ./ &&
./git rev-parse
'
test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
mkdir -p pretend/git pretend/libexec/git-core &&
echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
cp "$GIT_EXEC_PATH"/git$X pretend/git/ &&
GIT_EXEC_PATH= ./pretend/git/git here >actual &&
echo HERE >expect &&
test_cmp expect actual
'
test_done