t9902: disable test on the list of merge-strategies under GETTEXT_POISON
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2018 17:40:06 +0000 (10:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2018 18:27:52 +0000 (11:27 -0700)
The code to learn the list of merge strategies from the output of
"git merge -s help" forces C locale, so that it can notice the
message shown to indicate where the list starts in the output.

However, GETTEXT_POISON build corrupts its output even when run in
the C locale, and we cannot expect this test to succeed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9902-completion.sh
index 4c86adadf29abc77b4675d16f1676065387b4728..b7f5b1e632fb27a0448239361d6b4207be4b9908 100755 (executable)
@@ -1511,7 +1511,7 @@ test_expect_success 'sourcing the completion script clears cached porcelain comm
        verbose test -z "$__git_porcelain_commands"
 '
 
-test_expect_success 'sourcing the completion script clears cached merge strategies' '
+test_expect_success !GETTEXT_POISON 'sourcing the completion script clears cached merge strategies' '
        __git_compute_merge_strategies &&
        verbose test -n "$__git_merge_strategies" &&
        . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&