tests: remove all uses of test_i18cmp

Finish the removal I started in 1108cea7f8e (tests: remove most uses
of test_i18ncmp, 2021-02-11). At that time the function wasn't removed
due to disruption with in-flight changes, remove the occurrences that
have landed since then.

As of writing this there are no test_i18ncmp uses between "master" and
"seen", so let's also remove the function to finally put it to rest.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3437-rebase-fixup-options.sh b/t/t3437-rebase-fixup-options.sh
index d0bdc7ed02d701cef4d2f203c79cc12b49b1de15..c023fefd681ba62b8296925b2051cffe365e63ac 100755 (executable)
--- a/t/t3437-rebase-fixup-options.sh
+++ b/t/t3437-rebase-fixup-options.sh
@@ -157,7 +157,7 @@ test_expect_success 'sequence of fixup, fixup -C & squash --signoff works' '
                git -c commit.status=false rebase -ik --signoff A &&
        git diff-tree --exit-code --patch HEAD B3 -- &&
        test_cmp_rev HEAD^ A &&
-       test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+       test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
                actual-squash-message
 '
 
@@ -191,7 +191,7 @@ test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '
        FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
                FAKE_MESSAGE_COPY=actual-combined-message \
                git -c commit.status=false rebase -i A &&
-       test_i18ncmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
+       test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
                actual-combined-message &&
        test_cmp_rev HEAD^ A
 '
@@ -204,7 +204,7 @@ test_expect_success 'fixup -C works upon --autosquash with amend!' '
                                                --signoff A &&
        git diff-tree --exit-code --patch HEAD B3 -- &&
        test_cmp_rev HEAD^ A &&
-       test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+       test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
                actual-squash-message
 '
 

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index cac7f443d0043f80bca18c07fcf585a601b7599d..7cfa934913b96c73f2391ca8d9ae612c60d93f4b 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -945,9 +945,9 @@ test_failing_trailer_option () {
        test_expect_success "$title" '
                # error message cannot be checked under i18n
                test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
-               test_i18ncmp expect actual &&
+               test_cmp expect actual &&
                test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
-               test_i18ncmp expect actual
+               test_cmp expect actual
        '
 }
 
@@ -966,7 +966,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
        fatal: unrecognized %(contents) argument: trailersonly
        EOF
        test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
-       test_i18ncmp expect actual
+       test_cmp expect actual
 '
 
 test_expect_success 'basic atom: head contents:trailers' '

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 6348e8d7339cda585d9bd20ca867d6638e706364..b823c140271037b9f8c03b6670e3133d2cc9d0c1 100644 (file)
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -1025,13 +1025,6 @@ test_cmp_bin () {
        cmp "$@"
 }
 
-# Wrapper for test_cmp which used to be used for
-# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
-# in-flight changes. Should not be used and will be removed soon.
-test_i18ncmp () {
-       test_cmp "$@"
-}
-
 # Wrapper for grep which used to be used for
 # GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
 # in-flight changes. Should not be used and will be removed soon.