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>
Ævar Arnfjörð Bjarmason committed
Apr 13, 2021 at 14:19 UTC
feeb03bce60a0ae635fa4d80b9557892949af76f
3 files changed
+6
-13
t/t3437-rebase-fixup-options.sh
+3
-3
@@ -157,7 +157,7 @@ test_expect_success 'sequence of fixup, fixup -C & squash --signoff works' '
157
git -c commit.status=false rebase -ik --signoff A &&
158
git diff-tree --exit-code --patch HEAD B3 -- &&
159
test_cmp_rev HEAD^ A &&
160
- test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
160
+ test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
161
actual-squash-message
162
'
163
@@ -191,7 +191,7 @@ test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '
191
FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
192
FAKE_MESSAGE_COPY=actual-combined-message \
193
git -c commit.status=false rebase -i A &&
194
- test_i18ncmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
194
+ test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
195
actual-combined-message &&
196
test_cmp_rev HEAD^ A
197
'
@@ -204,7 +204,7 @@ test_expect_success 'fixup -C works upon --autosquash with amend!' '
204
--signoff A &&
205
git diff-tree --exit-code --patch HEAD B3 -- &&
206
test_cmp_rev HEAD^ A &&
207
- test_i18ncmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
207
+ test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
208
actual-squash-message
209
'
210
t/t6300-for-each-ref.sh
+3
-3
@@ -945,9 +945,9 @@ test_failing_trailer_option () {
945
test_expect_success "$title" '
946
# error message cannot be checked under i18n
947
test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
948
- test_i18ncmp expect actual &&
948
+ test_cmp expect actual &&
949
test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
950
- test_i18ncmp expect actual
950
+ test_cmp expect actual
951
'
952
}
953
@@ -966,7 +966,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
966
fatal: unrecognized %(contents) argument: trailersonly
967
EOF
968
test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
969
- test_i18ncmp expect actual
969
+ test_cmp expect actual
970
'
971
972
test_expect_success 'basic atom: head contents:trailers' '
t/test-lib-functions.sh
-7
@@ -1025,13 +1025,6 @@ test_cmp_bin () {
1025
cmp "$@"
1026
}
1027
1028
-# Wrapper for test_cmp which used to be used for
1029
-# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
1030
-# in-flight changes. Should not be used and will be removed soon.
1031
-test_i18ncmp () {
1032
- test_cmp "$@"
1033
-}
1034
-
1028
# Wrapper for grep which used to be used for
1029
# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
1030
# in-flight changes. Should not be used and will be removed soon.