diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:17 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 15:59:17 +0900 |
| commit | 92034a9cd5e71cf686ef66029433bdaba75027b0 (patch) | |
| tree | 48a2d6429c993e75dc0f4ab76268509dcc82de5f /t/t0061-run-command.sh | |
| parent | c988f6425acbd9765c55490c45d61f7531d5d83b (diff) | |
| parent | 64f982b8a791a8e9e612a103d05e5f01a08fce0f (diff) | |
| download | git-92034a9cd5e71cf686ef66029433bdaba75027b0.tar.gz | |
Merge branch 'dj/runtime-prefix'
A build-time option has been added to allow Git to be told to refer
to its associated files relative to the main binary, in the same
way that has been possible on Windows for quite some time, for
Linux, BSDs and Darwin.
* dj/runtime-prefix:
Makefile: quote $INSTLIBDIR when passing it to sed
Makefile: remove unused @@PERLLIBDIR@@ substitution variable
mingw/msvc: use the new-style RUNTIME_PREFIX helper
exec_cmd: provide a new-style RUNTIME_PREFIX helper for Windows
exec_cmd: RUNTIME_PREFIX on some POSIX systems
Makefile: add Perl runtime prefix support
Makefile: generate Perl header from template file
Diffstat (limited to 't/t0061-run-command.sh')
| -rwxr-xr-x | t/t0061-run-command.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0061-run-command.sh b/t/t0061-run-command.sh index d03149be9f..c887ed5b45 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 } |