diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-02-11 04:53:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-11 10:48:27 +0300 |
| commit | 1108cea7f8ee38a8507c1cc68d1fafe2eb31d623 (patch) | |
| tree | d739cc6d7733e975f04482966302d19e5a480540 /t/t6020-bundle-misc.sh | |
| parent | b1e079807b3d3c3592c40cab8bc0379879b6fad5 (diff) | |
tests: remove most uses of test_i18ncmp
As a follow-up to d162b25f956 (tests: remove support for
GIT_TEST_GETTEXT_POISON, 2021-01-20) remove most uses of test_i18ncmp
via a simple s/test_i18ncmp/test_cmp/g search-replacement.
I'm leaving t6300-for-each-ref.sh out due to a conflict with in-flight
changes between "master" and "seen", as well as the prerequisite
itself due to other changes between "master" and "next/seen" which add
new test_i18ncmp uses.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6020-bundle-misc.sh')
| -rwxr-xr-x | t/t6020-bundle-misc.sh | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh index 6249420a80..90b2be9b2e 100755 --- a/t/t6020-bundle-misc.sh +++ b/t/t6020-bundle-misc.sh @@ -175,7 +175,7 @@ test_expect_success 'create bundle from special rev: main^!' ' cat >expect <<-\EOF && <COMMIT-P> refs/heads/main EOF - test_i18ncmp expect actual && + test_cmp expect actual && git bundle verify special-rev.bdl | make_user_friendly_and_stable_output >actual && @@ -185,7 +185,7 @@ test_expect_success 'create bundle from special rev: main^!' ' The bundle requires this ref: <COMMIT-O> EOF - test_i18ncmp expect actual && + test_cmp expect actual && test_bundle_object_count special-rev.bdl 3 ' @@ -207,7 +207,7 @@ test_expect_success 'create bundle with --max-count option' ' The bundle requires this ref: <COMMIT-O> EOF - test_i18ncmp expect actual && + test_cmp expect actual && test_bundle_object_count max-count.bdl 4 ' @@ -236,7 +236,7 @@ test_expect_success 'create bundle with --since option' ' <COMMIT-M> <COMMIT-K> EOF - test_i18ncmp expect actual && + test_cmp expect actual && test_bundle_object_count --thin since.bdl 13 ' @@ -262,11 +262,11 @@ test_expect_success 'create bundle 1 - no prerequisites' ' # verify bundle, which has no prerequisites git bundle verify 1.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && git bundle verify stdin-1.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && test_bundle_object_count 1.bdl 24 && test_bundle_object_count stdin-1.bdl 24 @@ -304,11 +304,11 @@ test_expect_success 'create bundle 2 - has prerequisites' ' git bundle verify 2.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && git bundle verify stdin-2.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && test_bundle_object_count 2.bdl 16 && test_bundle_object_count stdin-2.bdl 16 @@ -326,11 +326,11 @@ test_expect_success 'fail to verify bundle without prerequisites' ' test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual + test_cmp expect actual ' test_expect_success 'create bundle 3 - two refs, same object' ' @@ -363,11 +363,11 @@ test_expect_success 'create bundle 3 - two refs, same object' ' git bundle verify 3.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && git bundle verify stdin-3.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && test_bundle_object_count 3.bdl 4 && test_bundle_object_count stdin-3.bdl 4 @@ -404,11 +404,11 @@ test_expect_success 'create bundle 4 - with tags' ' git bundle verify 4.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && git bundle verify stdin-4.bdl | make_user_friendly_and_stable_output >actual && - test_i18ncmp expect actual && + test_cmp expect actual && test_bundle_object_count 4.bdl 3 && test_bundle_object_count stdin-4.bdl 3 |