tests: avoid using `test_i18ncmp`

Since `test_i18ncmp` was deprecated in v2.31.*, the instances added in
v2.30.9 needed to be converted to `test_cmp` calls.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 57ba303de8b6e275cca26a1d1a46bffb094cadb8..9d9aa2855d226feed852bfe968d8d1a27fcf447e 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -344,7 +344,7 @@ test_expect_success 'large attributes line ignored in tree' '
        printf "path %02043d" 1 >.gitattributes &&
        git check-attr --all path >actual 2>err &&
        echo "warning: ignoring overly long attributes line 1" >expect &&
-       test_i18ncmp expect err &&
+       test_cmp expect err &&
        test_must_be_empty actual
 '
 
@@ -357,7 +357,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' '
        printf "a %02045dtrailing attribute\n" 1 >.gitattributes &&
        git check-attr --all trailing >actual 2>err &&
        echo "warning: ignoring overly long attributes line 1" >expect &&
-       test_i18ncmp expect err &&
+       test_cmp expect err &&
        test_must_be_empty actual
 '
 
@@ -366,7 +366,7 @@ test_expect_success EXPENSIVE 'large attributes file ignored in tree' '
        dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null &&
        git check-attr --all path >/dev/null 2>err &&
        echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect &&
-       test_i18ncmp expect err
+       test_cmp expect err
 '
 
 test_expect_success 'large attributes line ignored in index' '
@@ -375,7 +375,7 @@ test_expect_success 'large attributes line ignored in index' '
        git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
        git check-attr --cached --all path >actual 2>err &&
        echo "warning: ignoring overly long attributes line 1" >expect &&
-       test_i18ncmp expect err &&
+       test_cmp expect err &&
        test_must_be_empty actual
 '
 
@@ -385,7 +385,7 @@ test_expect_success 'large attributes line ignores trailing content in index' '
        git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
        git check-attr --cached --all trailing >actual 2>err &&
        echo "warning: ignoring overly long attributes line 1" >expect &&
-       test_i18ncmp expect err &&
+       test_cmp expect err &&
        test_must_be_empty actual
 '
 

diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index 2d03c4e4d19abac87da0b0543ad423790081d7b2..2b034ff771465f368b7ad05bf03857734c8fc9e4 100755 (executable)
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -72,7 +72,7 @@ test_expect_success SYMLINKS 'symlink escape when creating new files' '
        cat >expected_stderr <<-EOF &&
        error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
        EOF
-       test_i18ncmp expected_stderr stderr &&
+       test_cmp expected_stderr stderr &&
        ! test_path_exists .git/create-me
 '
 

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' '