OSDN Git Service

t3420: fix under GETTEXT_POISON build
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2017 18:56:25 +0000 (11:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Jun 2017 18:56:25 +0000 (11:56 -0700)
Newly added tests to t3420 in this series prepare expected
human-readable output from "git rebase -i" and then compare the
actual output with it.  As the output from the command is designed
to go through i18n/l10n, we need to use test_i18ncmp to tell
GETTEXT_POISON build that it is OK the output does not match.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3420-rebase-autostash.sh

index 6826c38..e243700 100755 (executable)
@@ -178,7 +178,7 @@ testrebase () {
                test_when_finished git branch -D rebased-feature-branch &&
                suffix=${type#\ --} && suffix=${suffix:-am} &&
                create_expected_success_$suffix &&
-               test_cmp expected actual
+               test_i18ncmp expected actual
        '
 
        test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
@@ -275,7 +275,7 @@ testrebase () {
                test_when_finished git branch -D rebased-feature-branch &&
                suffix=${type#\ --} && suffix=${suffix:-am} &&
                create_expected_failure_$suffix &&
-               test_cmp expected actual
+               test_i18ncmp expected actual
        '
 }