From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Ramsay Jones <ramsay@ramsayjones.plus.com>,
Duy Nguyen <pclouds@gmail.com>,
Junio C Hamano <gitster@pobox.com>, Johannes Sixt <j6t@kdbg.org>,
Jeff King <peff@peff.net>,
Eric Sunshine <sunshine@sunshineco.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v3 1/5] tests: exercise the RUNTIME_PREFIX feature
Date: Sat, 24 Jul 2021 22:06:49 +0000 [thread overview]
Message-ID: <cc8f09baba94546a13087e923e9c2374284c8136.1627164413.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.66.v3.git.1627164413.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Originally, we refrained from adding a regression test in 7b6c6496374
(system_path(): Add prefix computation at runtime if RUNTIME_PREFIX set,
2008-08-10), and in 226c0ddd0d6 (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 <johannes.schindelin@gmx.de>
---
Makefile | 5 +++++
t/t0060-path-utils.sh | 18 ++++++++++++++++++
2 files changed, 23 insertions(+)
diff --git a/Makefile b/Makefile
index c3565fc0f8f..4c3e4ccabcd 100644
--- a/Makefile
+++ b/Makefile
@@ -2826,6 +2826,11 @@ 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 de4960783f0..a76728c27bf 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -525,4 +525,22 @@ test_expect_success MINGW 'is_valid_path() on Windows' '
"PRN./abc"
'
+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/bin pretend/libexec/git-core &&
+ echo "echo HERE" | write_script pretend/libexec/git-core/git-here &&
+ cp "$GIT_EXEC_PATH"/git$X pretend/bin/ &&
+ GIT_EXEC_PATH= ./pretend/bin/git here >actual &&
+ echo HERE >expect &&
+ test_cmp expect actual
+'
+
test_done
--
gitgitgadget
next prev parent reply other threads:[~2021-07-24 22:07 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 14:53 [PATCH 0/1] mingw: handle absolute paths in expand_user_path() Johannes Schindelin via GitGitGadget
2018-11-06 14:53 ` [PATCH 1/1] " Johannes Schindelin via GitGitGadget
2018-11-06 15:54 ` Ramsay Jones
2018-11-06 16:10 ` Ramsay Jones
2018-11-06 18:27 ` Duy Nguyen
2018-11-07 1:21 ` Junio C Hamano
2018-11-07 11:19 ` Johannes Schindelin
2018-11-07 17:42 ` Ramsay Jones
2018-11-08 0:16 ` Junio C Hamano
2018-11-08 13:04 ` Johannes Schindelin
2018-11-08 14:43 ` Junio C Hamano
2018-11-08 15:39 ` Johannes Schindelin
2018-11-09 2:05 ` Joseph Moisan
2018-11-09 10:21 ` Jeff King
2018-11-06 18:24 ` Duy Nguyen
2018-11-07 11:19 ` Johannes Schindelin
2018-11-06 21:32 ` Johannes Sixt
2018-11-07 11:23 ` Johannes Schindelin
2018-11-07 18:52 ` Johannes Sixt
2018-11-07 20:41 ` Jeff King
2018-11-07 21:36 ` Johannes Sixt
2018-11-07 22:03 ` Jeff King
2018-11-08 0:30 ` Junio C Hamano
2018-11-08 1:18 ` Jeff King
2018-11-08 3:26 ` Junio C Hamano
2018-11-08 13:11 ` Johannes Schindelin
2018-11-08 14:25 ` Duy Nguyen
2018-11-08 15:45 ` Johannes Schindelin
2018-11-08 17:40 ` Eric Sunshine
2018-11-09 10:19 ` Jeff King
2018-11-09 16:16 ` Duy Nguyen
2018-11-12 3:03 ` Junio C Hamano
2018-11-08 14:47 ` Junio C Hamano
2018-11-08 15:46 ` Johannes Schindelin
2021-07-01 16:03 ` [PATCH v2 0/2] " Johannes Schindelin via GitGitGadget
2021-07-01 16:03 ` [PATCH v2 1/2] tests: exercise the RUNTIME_PREFIX feature Johannes Schindelin via GitGitGadget
2021-07-01 16:03 ` [PATCH v2 2/2] expand_user_path(): support specifying paths relative to the runtime prefix Johannes Schindelin via GitGitGadget
2021-07-01 17:42 ` [PATCH v2 0/2] mingw: handle absolute paths in expand_user_path() Junio C Hamano
2021-07-24 22:06 ` [PATCH v3 0/5] " Johannes Schindelin via GitGitGadget
2021-07-24 22:06 ` Johannes Schindelin via GitGitGadget [this message]
2021-07-24 22:06 ` [PATCH v3 2/5] expand_user_path(): remove stale part of the comment Johannes Schindelin via GitGitGadget
2021-07-24 22:06 ` [PATCH v3 3/5] expand_user_path(): clarify the role of the `real_home` parameter Johannes Schindelin via GitGitGadget
2021-07-24 22:06 ` [PATCH v3 4/5] Use a better name for the function interpolating paths Johannes Schindelin via GitGitGadget
2021-07-26 22:05 ` Junio C Hamano
2021-07-27 7:57 ` Fabian Stelzer
2021-07-27 22:56 ` Junio C Hamano
2021-07-28 0:14 ` Junio C Hamano
2021-07-28 0:39 ` Junio C Hamano
2021-07-28 5:43 ` Junio C Hamano
2021-07-28 8:18 ` Fabian Stelzer
2021-07-28 17:08 ` Junio C Hamano
2021-07-24 22:06 ` [PATCH v3 5/5] interpolate_path(): allow specifying paths relative to the runtime prefix Johannes Schindelin via GitGitGadget
2021-07-26 17:56 ` [PATCH v3 0/5] mingw: handle absolute paths in expand_user_path() Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc8f09baba94546a13087e923e9c2374284c8136.1627164413.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=ramsay@ramsayjones.plus.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).