test: use test_i18ncmp when checking --stat output

Ever since v1.7.9.2~13 (2012-02-01), git's diffstat-style summary line
produced by "git apply --stat", "git diff --stat", and "git commit"
varies by locale, producing test failures when GETTEXT_POISON is set.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index 9f00ada5f7776b2377993cc9392b89e5312a513f..644aa219e9b3d030d8c6789d1c4edbcd2307b941 100755 (executable)
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -174,7 +174,7 @@ EOF
 test_expect_success TABS_IN_FILENAMES 'git diff-tree rename with-funny applied' \
        'git diff-index -M -p $t0 |
         git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
 test_expect_success TABS_IN_FILENAMES 'git diff-tree rename with-funny applied' \
        'git diff-index -M -p $t0 |
         git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&

-        test_cmp expected current'
+        test_i18ncmp expected current'

 
 test_expect_success TABS_IN_FILENAMES 'setup expect' '
 cat > expected <<\EOF
 
 test_expect_success TABS_IN_FILENAMES 'setup expect' '
 cat > expected <<\EOF


@@ -187,12 +187,12 @@ EOF
 test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny applied' \
        'git diff-index -p $t0 |
         git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
 test_expect_success TABS_IN_FILENAMES 'git diff-tree delete with-funny applied' \
        'git diff-index -p $t0 |
         git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&

-        test_cmp expected current'
+        test_i18ncmp expected current'

 
 test_expect_success TABS_IN_FILENAMES 'git apply non-git diff' \
        'git diff-index -p $t0 |
         sed -ne "/^[-+@]/p" |
         git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&
 
 test_expect_success TABS_IN_FILENAMES 'git apply non-git diff' \
        'git diff-index -p $t0 |
         sed -ne "/^[-+@]/p" |
         git apply --stat | sed -e "s/|.*//" -e "s/ *\$//" >current &&

-        test_cmp expected current'
+        test_i18ncmp expected current'

 
 test_done
 
 test_done

diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index 1b3a344158aa8077c1e5b47f9ab8bd6394e153ed..d909e6dbcf0f1af90b616d5b83acebd962a7f751 100755 (executable)
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -55,7 +55,7 @@ test_expect_success 'cherry-pick first..fourth works' '
        git diff --quiet HEAD other &&
 
        sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
        git diff --quiet HEAD other &&
 
        sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&

-       test_cmp expected actual.fuzzy &&
+       test_i18ncmp expected actual.fuzzy &&

        check_head_differs_from fourth
 '
 
        check_head_differs_from fourth
 '
 


@@ -82,7 +82,7 @@ test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
        git diff --quiet other &&
        git diff --quiet HEAD other &&
        sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
        git diff --quiet other &&
        git diff --quiet HEAD other &&
        sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&

-       test_cmp expected actual.fuzzy &&
+       test_i18ncmp expected actual.fuzzy &&

        check_head_differs_from fourth
 '
 
        check_head_differs_from fourth
 '
 

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 663c60a12e82c96065e60fd448a6583c91e5a2cd..c69e4da182a3236c5b29c481c199ea5067c2e35a 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -447,7 +447,7 @@ test_expect_success 'stash show - stashes on stack, stash-like argument' '
         1 file changed, 1 insertion(+)
        EOF
        git stash show ${STASH_ID} >actual &&
         1 file changed, 1 insertion(+)
        EOF
        git stash show ${STASH_ID} >actual &&

-       test_cmp expected actual
+       test_i18ncmp expected actual

 '
 
 test_expect_success 'stash show -p - stashes on stack, stash-like argument' '
 '
 
 test_expect_success 'stash show -p - stashes on stack, stash-like argument' '


@@ -485,7 +485,7 @@ test_expect_success 'stash show - no stashes on stack, stash-like argument' '
         1 file changed, 1 insertion(+)
        EOF
        git stash show ${STASH_ID} >actual &&
         1 file changed, 1 insertion(+)
        EOF
        git stash show ${STASH_ID} >actual &&

-       test_cmp expected actual
+       test_i18ncmp expected actual

 '
 
 test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '
 '
 
 test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 2d9f9a0cf1555cab24af19f264d495e134c27352..008cf10a0cc37e18714578fd777c0b734f87d9f4 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -25,11 +25,11 @@ cat > expected <<\EOF
 EOF
 test_expect_success 'diff without --binary' \
        'git diff | git apply --stat --summary >current &&
 EOF
 test_expect_success 'diff without --binary' \
        'git diff | git apply --stat --summary >current &&

-        test_cmp expected current'
+        test_i18ncmp expected current'

 
 test_expect_success 'diff with --binary' \
        'git diff --binary | git apply --stat --summary >current &&
 
 test_expect_success 'diff with --binary' \
        'git diff --binary | git apply --stat --summary >current &&

-        test_cmp expected current'
+        test_i18ncmp expected current'

 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.

diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index a6d1887536e240e89b8e2263e5f0a643e9a55f71..591ffbc07539e6d45d4d0e8cc4d7c015f0952a3a 100755 (executable)
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -19,7 +19,7 @@ test_expect_success setup '
         2 files changed, 2 insertions(+)
        EOF
        git diff --stat --stat-count=2 >actual &&
         2 files changed, 2 insertions(+)
        EOF
        git diff --stat --stat-count=2 >actual &&

-       test_cmp expect actual
+       test_i18ncmp expect actual

 '
 
 test_done
 '
 
 test_done

diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 9b433de83630774206fb89dfae1a4396264390cc..744b8e51beab59c78807e0622f10bf421b3142ec 100755 (executable)
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -17,13 +17,13 @@ do
        test_expect_success "$title" '
                git apply --stat --summary \
                        <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
        test_expect_success "$title" '
                git apply --stat --summary \
                        <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&

-               test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+               test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current

        '
 
        test_expect_success "$title with recount" '
                sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
                git apply --recount --stat --summary >current &&
        '
 
        test_expect_success "$title with recount" '
                sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
                git apply --recount --stat --summary >current &&

-               test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+               test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current

        '
 done <<\EOF
 rename
        '
 done <<\EOF
 rename

diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index 2af8947eebb3e9ee45f83acb398335ec163a521c..432f98c357601057cb89f9dd6bfbe1ab02e9477a 100755 (executable)
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -216,7 +216,7 @@ test_expect_success 'pull request format' '
                git request-pull initial "$downstream_url" >../request
        ) &&
        <request sed -nf fuzz.sed >request.fuzzy &&
                git request-pull initial "$downstream_url" >../request
        ) &&
        <request sed -nf fuzz.sed >request.fuzzy &&

-       test_cmp expect request.fuzzy
+       test_i18ncmp expect request.fuzzy

 
 '
 
 
 '
 

diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 5783ebf3ab042d3c78633a89d842c432c96a0d4d..bce0bd37cb6006f29b9c8c532863947c44509486 100755 (executable)
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -66,7 +66,7 @@ EOF
 test_expect_success 'merge output uses pretty names' '
        git reset --hard c1 &&
        git merge c2 c3 c4 >actual &&
 test_expect_success 'merge output uses pretty names' '
        git reset --hard c1 &&
        git merge c2 c3 c4 >actual &&

-       test_cmp actual expected
+       test_i18ncmp expected actual

 '
 
 cat >expected <<\EOF
 '
 
 cat >expected <<\EOF


@@ -80,7 +80,7 @@ EOF
 
 test_expect_success 'merge up-to-date output uses pretty names' '
        git merge c4 c5 >actual &&
 
 test_expect_success 'merge up-to-date output uses pretty names' '
        git merge c4 c5 >actual &&

-       test_cmp actual expected
+       test_i18ncmp expected actual

 '
 
 cat >expected <<\EOF
 '
 
 cat >expected <<\EOF


@@ -97,7 +97,7 @@ EOF
 test_expect_success 'merge fast-forward output uses pretty names' '
        git reset --hard c0 &&
        git merge c1 c2 >actual &&
 test_expect_success 'merge fast-forward output uses pretty names' '
        git reset --hard c0 &&
        git merge c1 c2 >actual &&

-       test_cmp actual expected
+       test_i18ncmp expected actual

 '
 
 test_done
 '
 
 test_done