Skip to content

Commit 92957d8

Browse files
committed
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 <[email protected]>
1 parent b524e89 commit 92957d8

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

t/t0003-attributes.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ test_expect_success 'large attributes line ignored in tree' '
344344
printf "path %02043d" 1 >.gitattributes &&
345345
git check-attr --all path >actual 2>err &&
346346
echo "warning: ignoring overly long attributes line 1" >expect &&
347-
test_i18ncmp expect err &&
347+
test_cmp expect err &&
348348
test_must_be_empty actual
349349
'
350350

@@ -357,7 +357,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' '
357357
printf "a %02045dtrailing attribute\n" 1 >.gitattributes &&
358358
git check-attr --all trailing >actual 2>err &&
359359
echo "warning: ignoring overly long attributes line 1" >expect &&
360-
test_i18ncmp expect err &&
360+
test_cmp expect err &&
361361
test_must_be_empty actual
362362
'
363363

@@ -366,7 +366,7 @@ test_expect_success EXPENSIVE 'large attributes file ignored in tree' '
366366
dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null &&
367367
git check-attr --all path >/dev/null 2>err &&
368368
echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect &&
369-
test_i18ncmp expect err
369+
test_cmp expect err
370370
'
371371

372372
test_expect_success 'large attributes line ignored in index' '
@@ -375,7 +375,7 @@ test_expect_success 'large attributes line ignored in index' '
375375
git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
376376
git check-attr --cached --all path >actual 2>err &&
377377
echo "warning: ignoring overly long attributes line 1" >expect &&
378-
test_i18ncmp expect err &&
378+
test_cmp expect err &&
379379
test_must_be_empty actual
380380
'
381381

@@ -385,7 +385,7 @@ test_expect_success 'large attributes line ignores trailing content in index' '
385385
git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
386386
git check-attr --cached --all trailing >actual 2>err &&
387387
echo "warning: ignoring overly long attributes line 1" >expect &&
388-
test_i18ncmp expect err &&
388+
test_cmp expect err &&
389389
test_must_be_empty actual
390390
'
391391

t/t4115-apply-symlink.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ test_expect_success SYMLINKS 'symlink escape when creating new files' '
7272
cat >expected_stderr <<-EOF &&
7373
error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
7474
EOF
75-
test_i18ncmp expected_stderr stderr &&
75+
test_cmp expected_stderr stderr &&
7676
! test_path_exists .git/create-me
7777
'
7878

t/t6300-for-each-ref.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -945,9 +945,9 @@ test_failing_trailer_option () {
945945
test_expect_success "$title" '
946946
# error message cannot be checked under i18n
947947
test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
948-
test_i18ncmp expect actual &&
948+
test_cmp expect actual &&
949949
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
951951
'
952952
}
953953

@@ -966,7 +966,7 @@ test_expect_success 'if arguments, %(contents:trailers) shows error if colon is
966966
fatal: unrecognized %(contents) argument: trailersonly
967967
EOF
968968
test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
969-
test_i18ncmp expect actual
969+
test_cmp expect actual
970970
'
971971

972972
test_expect_success 'basic atom: head contents:trailers' '

0 commit comments

Comments
 (0)