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>
Johannes Schindelin committed
Mar 11, 2023 at 18:02 UTC
92957d84271d8a54604df0a78c4318485c607ef6
3 files changed
+9
-9
t/t0003-attributes.sh
+5
-5
@@ -344,7 +344,7 @@ test_expect_success 'large attributes line ignored in tree' '
344
printf "path %02043d" 1 >.gitattributes &&
345
git check-attr --all path >actual 2>err &&
346
echo "warning: ignoring overly long attributes line 1" >expect &&
347
- test_i18ncmp expect err &&
347
+ test_cmp expect err &&
348
test_must_be_empty actual
349
'
350
@@ -357,7 +357,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' '
357
printf "a %02045dtrailing attribute\n" 1 >.gitattributes &&
358
git check-attr --all trailing >actual 2>err &&
359
echo "warning: ignoring overly long attributes line 1" >expect &&
360
- test_i18ncmp expect err &&
360
+ test_cmp expect err &&
361
test_must_be_empty actual
362
'
363
@@ -366,7 +366,7 @@ test_expect_success EXPENSIVE 'large attributes file ignored in tree' '
366
dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null &&
367
git check-attr --all path >/dev/null 2>err &&
368
echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect &&
369
- test_i18ncmp expect err
369
+ test_cmp expect err
370
'
371
372
test_expect_success 'large attributes line ignored in index' '
@@ -375,7 +375,7 @@ test_expect_success 'large attributes line ignored in index' '
375
git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
376
git check-attr --cached --all path >actual 2>err &&
377
echo "warning: ignoring overly long attributes line 1" >expect &&
378
- test_i18ncmp expect err &&
378
+ test_cmp expect err &&
379
test_must_be_empty actual
380
'
381
@@ -385,7 +385,7 @@ test_expect_success 'large attributes line ignores trailing content in index' '
385
git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
386
git check-attr --cached --all trailing >actual 2>err &&
387
echo "warning: ignoring overly long attributes line 1" >expect &&
388
- test_i18ncmp expect err &&
388
+ test_cmp expect err &&
389
test_must_be_empty actual
390
'
391
t/t4115-apply-symlink.sh
+1
-1
@@ -72,7 +72,7 @@ test_expect_success SYMLINKS 'symlink escape when creating new files' '
72
cat >expected_stderr <<-EOF &&
73
error: affected file ${SQ}renamed-symlink/create-me${SQ} is beyond a symbolic link
74
EOF
75
- test_i18ncmp expected_stderr stderr &&
75
+ test_cmp expected_stderr stderr &&
76
! test_path_exists .git/create-me
77
'
78
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' '