i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 12, 2011 at 16:33 UTC
b3e1900a740156586b00c62f8fe67aafb1ce346d
6 files changed
+15
-17
t/t5541-http-push.sh
+2
-2
@@ -135,8 +135,8 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
135
grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
136
'
137
138
-test_expect_success C_LOCALE_OUTPUT 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
139
- grep "To prevent you from losing history, non-fast-forward updates were rejected" \
138
+test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
139
+ test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" \
140
output
141
'
142
t/t6040-tracking-info.sh
+2
-2
@@ -42,13 +42,13 @@ b3 behind 1
42
b4 ahead 2
43
EOF
44
45
-test_expect_success C_LOCALE_OUTPUT 'branch -v' '
45
+test_expect_success 'branch -v' '
46
(
47
cd test &&
48
git branch -v
49
) |
50
sed -n -e "$script" >actual &&
51
- test_cmp expect actual
51
+ test_i18ncmp expect actual
52
'
53
54
test_expect_success 'checkout' '
t/t6120-describe.sh
+2
-2
@@ -123,8 +123,8 @@ cat - >err.expect <<EOF
123
warning: tag 'A' is really 'Q' here
124
EOF
125
check_describe A-* HEAD
126
-test_expect_success C_LOCALE_OUTPUT 'warning was displayed for Q' '
127
- test_cmp err.expect err.actual
126
+test_expect_success 'warning was displayed for Q' '
127
+ test_i18ncmp err.expect err.actual
128
'
129
test_expect_success 'rename tag Q back to A' '
130
mv .git/refs/tags/Q .git/refs/tags/A
t/t7004-tag.sh
+2
-4
@@ -1120,13 +1120,11 @@ test_expect_success \
1120
! (GIT_EDITOR=cat git tag -a initial-comment > actual)
1121
'
1122
1123
-test_expect_success \
1124
- C_LOCALE_OUTPUT \
1125
- 'message in editor has initial comment: first line' '
1123
+test_expect_success 'message in editor has initial comment: first line' '
1124
# check the first line --- should be empty
1125
echo >first.expect &&
1126
sed -e 1q <actual >first.actual &&
1129
- test_cmp first.expect first.actual
1127
+ test_i18ncmp first.expect first.actual
1128
'
1129
1130
test_expect_success \
t/t7012-skip-worktree-writing.sh
+4
-4
@@ -124,16 +124,16 @@ cat >expected <<EOF
124
Would remove expected
125
Would remove result
126
EOF
127
-test_expect_success C_LOCALE_OUTPUT 'git-clean, absent case' '
127
+test_expect_success 'git-clean, absent case' '
128
setup_absent &&
129
git clean -n > result &&
130
- test_cmp expected result
130
+ test_i18ncmp expected result
131
'
132
133
-test_expect_success C_LOCALE_OUTPUT 'git-clean, dirty case' '
133
+test_expect_success 'git-clean, dirty case' '
134
setup_dirty &&
135
git clean -n > result &&
136
- test_cmp expected result
136
+ test_i18ncmp expected result
137
'
138
139
#TODO test_expect_failure 'git-apply adds file' false
t/t7060-wtstatus.sh
+3
-3
@@ -38,7 +38,7 @@ cat >expect <<EOF
38
no changes added to commit (use "git add" and/or "git commit -a")
39
EOF
40
41
-test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' '
41
+test_expect_success 'M/D conflict does not segfault' '
42
mkdir mdconflict &&
43
(
44
cd mdconflict &&
@@ -50,9 +50,9 @@ test_expect_success C_LOCALE_OUTPUT 'M/D conflict does not segfault' '
50
git commit -m delete &&
51
test_must_fail git merge master &&
52
test_must_fail git commit --dry-run >../actual &&
53
- test_cmp ../expect ../actual &&
53
+ test_i18ncmp ../expect ../actual &&
54
git status >../actual &&
55
- test_cmp ../expect ../actual
55
+ test_i18ncmp ../expect ../actual
56
)
57
'
58