Skip to content

Commit 81b29de

Browse files
committed
fixup! tests: exercise the RUNTIME_PREFIX feature
This drops the original patch in preparation for merging the version that made it upstream. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent c7d0a86 commit 81b29de

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

Makefile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2888,11 +2888,6 @@ ifdef GIT_TEST_INDEX_VERSION
28882888
endif
28892889
ifdef GIT_TEST_PERL_FATAL_WARNINGS
28902890
@echo GIT_TEST_PERL_FATAL_WARNINGS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_PERL_FATAL_WARNINGS)))'\' >>$@+
2891-
endif
2892-
ifdef RUNTIME_PREFIX
2893-
@echo RUNTIME_PREFIX=\'true\' >>$@+
2894-
else
2895-
@echo RUNTIME_PREFIX=\'false\' >>$@+
28962891
endif
28972892
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
28982893

t/t0060-path-utils.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -544,23 +544,6 @@ test_expect_success MINGW 'MSYSTEM/PATH is adjusted if necessary' '
544544
test_write_lines MSYSTEM=$MSYSTEM mingw64 usr >expect &&
545545
test_cmp expect actual
546546
'
547-
548-
test_lazy_prereq RUNTIME_PREFIX '
549-
test true = "$RUNTIME_PREFIX"
550-
'
551-
552-
test_lazy_prereq CAN_EXEC_IN_PWD '
553-
cp "$GIT_EXEC_PATH"/git$X ./ &&
554-
./git rev-parse
555-
'
556-
557-
test_expect_success RUNTIME_PREFIX,CAN_EXEC_IN_PWD 'RUNTIME_PREFIX works' '
558-
mkdir -p pretend/git pretend/libexec/git-core &&
559-
echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
560-
cp "$GIT_EXEC_PATH"/git$X pretend/git/ &&
561-
GIT_EXEC_PATH= ./pretend/git/git here >actual &&
562-
echo HERE >expect &&
563-
test_cmp expect actual
564547
'
565548
566549
test_done

0 commit comments

Comments
 (0)