summaryrefslogtreecommitdiff
path: root/t/t0061-run-command.sh
diff options
context:
space:
mode:
authorDan Jacques <dnj@google.com>2018-04-10 15:05:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-11 09:10:28 (GMT)
commit226c0ddd0d63dd6c8dde497c755af2ad1f02e0c1 (patch)
tree232d124263ccd6aa6370ac0e100c32b68c70fb94 /t/t0061-run-command.sh
parent07d90eadb50ee687a7313186b654975b0944a74e (diff)
downloadgit-226c0ddd0d63dd6c8dde497c755af2ad1f02e0c1.zip
git-226c0ddd0d63dd6c8dde497c755af2ad1f02e0c1.tar.gz
git-226c0ddd0d63dd6c8dde497c755af2ad1f02e0c1.tar.bz2
exec_cmd: RUNTIME_PREFIX on some POSIX systems
Enable Git to resolve its own binary location using a variety of OS-specific and generic methods, including: - procfs via "/proc/self/exe" (Linux) - _NSGetExecutablePath (Darwin) - KERN_PROC_PATHNAME sysctl on BSDs. - argv0, if absolute (all, including Windows). This is used to enable RUNTIME_PREFIX support for non-Windows systems, notably Linux and Darwin. When configured with RUNTIME_PREFIX, Git will do a best-effort resolution of its executable path and automatically use this as its "exec_path" for relative helper and data lookups, unless explicitly overridden. Small incidental formatting cleanup of "exec_cmd.c". Signed-off-by: Dan Jacques <dnj@google.com> Thanks-to: Robbie Iannucci <iannucci@google.com> Thanks-to: Junio C Hamano <gitster@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0061-run-command.sh')
-rwxr-xr-xt/t0061-run-command.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh
index d03149b..c887ed5 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -145,7 +145,7 @@ test_trace () {
expect="$1"
shift
GIT_TRACE=1 test-tool run-command "$@" run-command true 2>&1 >/dev/null | \
- sed 's/.* run_command: //' >actual &&
+ sed -e 's/.* run_command: //' -e '/trace: .*/d' >actual &&
echo "$expect true" >expect &&
test_cmp expect actual
}