Skip to content

Commit 49d2a03

Browse files
committed
t0061: fix with --with-dashes and RUNTIME_PREFIX
When building Git with RUNTIME_PREFIX and starting a test helper from t/helper/, it fails to detect the system prefix correctly. This is the reason that the warning RUNTIME_PREFIX requested, but prefix computation failed. [...] to be printed. In t0061, we did not expect that to happen, and it actually did not happen in the normal case, because bin-wrappers/test-tool specifically sets GIT_TEXTDOMAINDIR (and as a consequence, nothing in test-tool wants to know about the runtime prefix). However, with --with-dashes, bin-wrappers/test-tool is no longer called, but t/helper/test-tool is called directly. So let's just ignore the RUNTIME_PREFIX warning. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent d482f01 commit 49d2a03

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

t/t0061-run-command.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ test_trace () {
148148
expect="$1"
149149
shift
150150
GIT_TRACE=1 test-tool run-command "$@" run-command true 2>&1 >/dev/null | \
151-
sed -e 's/.* run_command: //' -e '/trace: .*/d' >actual &&
151+
sed -e 's/.* run_command: //' -e '/trace: .*/d' \
152+
-e '/RUNTIME_PREFIX requested/d' >actual &&
152153
echo "$expect true" >expect &&
153154
test_cmp expect actual
154155
}

0 commit comments

Comments
 (0)