i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 12, 2011 at 16:27 UTC
68b2a0055c9936235fac6559de783f39fb790318
3 files changed
+13
-13
t/t3700-add.sh
+5
-5
@@ -271,9 +271,9 @@ test_expect_success 'git add --dry-run of non-existing file' "
271
test_must_fail git add --dry-run track-this ignored-file >actual 2>&1
272
"
273
274
-test_expect_success C_LOCALE_OUTPUT 'git add --dry-run of an existing file output' "
274
+test_expect_success 'git add --dry-run of an existing file output' "
275
echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
276
- test_cmp expect actual
276
+ test_i18ncmp expect actual
277
"
278
279
cat >expect.err <<\EOF
@@ -290,9 +290,9 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
290
test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual.out 2>actual.err
291
'
292
293
-test_expect_success C_LOCALE_OUTPUT 'git add --dry-run --ignore-missing of non-existing file output' '
294
- test_cmp expect.out actual.out &&
295
- test_cmp expect.err actual.err
293
+test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
294
+ test_i18ncmp expect.out actual.out &&
295
+ test_i18ncmp expect.err actual.err
296
'
297
298
test_done
t/t4001-diff-rename.sh
+4
-4
@@ -64,17 +64,17 @@ test_expect_success \
64
'validate the output.' \
65
'compare_diff_patch current expected'
66
67
-test_expect_success C_LOCALE_OUTPUT 'favour same basenames over different ones' '
67
+test_expect_success 'favour same basenames over different ones' '
68
cp path1 another-path &&
69
git add another-path &&
70
git commit -m 1 &&
71
git rm path1 &&
72
mkdir subdir &&
73
git mv another-path subdir/path1 &&
74
- git status | grep "renamed: .*path1 -> subdir/path1"'
74
+ git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
75
76
-test_expect_success C_LOCALE_OUTPUT 'favour same basenames even with minor differences' '
76
+test_expect_success 'favour same basenames even with minor differences' '
77
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
78
- git status | grep "renamed: .*path1 -> subdir/path1"'
78
+ git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
79
80
test_done
t/t4014-format-patch.sh
+4
-4
@@ -614,13 +614,13 @@ echo "fatal: --name-only does not make sense" > expect.name-only
614
echo "fatal: --name-status does not make sense" > expect.name-status
615
echo "fatal: --check does not make sense" > expect.check
616
617
-test_expect_success C_LOCALE_OUTPUT 'options no longer allowed for format-patch' '
617
+test_expect_success 'options no longer allowed for format-patch' '
618
test_must_fail git format-patch --name-only 2> output &&
619
- test_cmp expect.name-only output &&
619
+ test_i18ncmp expect.name-only output &&
620
test_must_fail git format-patch --name-status 2> output &&
621
- test_cmp expect.name-status output &&
621
+ test_i18ncmp expect.name-status output &&
622
test_must_fail git format-patch --check 2> output &&
623
- test_cmp expect.check output'
623
+ test_i18ncmp expect.check output'
624
625
test_expect_success 'format-patch --numstat should produce a patch' '
626
git format-patch --numstat --stdout master..side > output &&