From 81b29dedd5cea4c36639b9fe5075bd8ebc7f8582 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 15 Oct 2021 14:11:20 +0200 Subject: [PATCH] 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 --- Makefile | 5 ----- t/t0060-path-utils.sh | 17 ----------------- 2 files changed, 22 deletions(-) diff --git a/Makefile b/Makefile index f54d62d556..5c9eaac3e9 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index 3f08bacd23..2595400229 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -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