i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 14, 2011 at 14:36 UTC
c9ea118e75b1b8f8cc744e372576b4cf63594e0d
4 files changed
+10
-19
t/t7600-merge.sh
+2
-2
@@ -495,10 +495,10 @@ test_expect_success 'merge fast-forward in a dirty tree' '
495
496
test_debug 'git log --graph --decorate --oneline --all'
497
498
-test_expect_success C_LOCALE_OUTPUT 'in-index merge' '
498
+test_expect_success 'in-index merge' '
499
git reset --hard c0 &&
500
git merge --no-ff -s resolve c1 >out &&
501
- grep "Wonderful." out &&
501
+ test_i18ngrep "Wonderful." out &&
502
verify_parents $c0 $c1
503
'
504
t/t7607-merge-overwrite.sh
+2
-5
@@ -150,11 +150,8 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
150
git rm -fr . &&
151
git checkout --orphan new &&
152
cp important c0.c &&
153
- test_must_fail git merge c0 2>out
154
-'
155
-
156
-test_expect_success C_LOCALE_OUTPUT 'will not overwrite untracked file on unborn branch: output' '
157
- test_cmp out expect
153
+ test_must_fail git merge c0 2>out &&
154
+ test_i18ncmp out expect
155
'
156
157
test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
t/t7611-merge-abort.sh
+4
-10
@@ -46,11 +46,8 @@ test_expect_success 'setup' '
46
pre_merge_head="$(git rev-parse HEAD)"
47
48
test_expect_success 'fails without MERGE_HEAD (unstarted merge)' '
49
- test_must_fail git merge --abort 2>output
50
-'
51
-
52
-test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (unstarted merge): fatal output' '
53
- grep -q MERGE_HEAD output
49
+ test_must_fail git merge --abort 2>output &&
50
+ test_i18ngrep MERGE_HEAD output
51
'
52
53
test_expect_success 'fails without MERGE_HEAD (unstarted merge): .git/MERGE_HEAD sanity' '
@@ -63,11 +60,8 @@ test_expect_success 'fails without MERGE_HEAD (completed merge)' '
60
test ! -f .git/MERGE_HEAD &&
61
# Merge successfully completed
62
post_merge_head="$(git rev-parse HEAD)" &&
66
- test_must_fail git merge --abort 2>output
67
-'
68
-
69
-test_expect_success C_LOCALE_OUTPUT 'fails without MERGE_HEAD (completed merge): output' '
70
- grep -q MERGE_HEAD output
63
+ test_must_fail git merge --abort 2>output &&
64
+ test_i18ngrep MERGE_HEAD output
65
'
66
67
test_expect_success 'fails without MERGE_HEAD (completed merge): .git/MERGE_HEAD sanity' '
t/t7811-grep-open.sh
+2
-2
@@ -61,9 +61,9 @@ test_expect_success SIMPLEPAGER 'git grep -O' '
61
test_cmp empty out
62
'
63
64
-test_expect_success C_LOCALE_OUTPUT 'git grep -O --cached' '
64
+test_expect_success 'git grep -O --cached' '
65
test_must_fail git grep --cached -O GREP_PATTERN >out 2>msg &&
66
- grep open-files-in-pager msg
66
+ test_i18ngrep open-files-in-pager msg
67
'
68
69
test_expect_success 'git grep -O --no-index' '