i18n: use test_i18ngrep in lib-httpd and t2019
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 12, 2011 at 16:12 UTC
d3bd0425b21b84fbc554b24b4315bfcbc2d7a5bf
2 files changed
+8
-9
t/lib-httpd.sh
+2
-3
@@ -157,8 +157,7 @@ test_http_push_nonff() {
157
grep "^ ! \[rejected\][ ]*$BRANCH -> $BRANCH (non-fast-forward)$" output
158
'
159
160
- test_expect_success C_LOCALE_OUTPUT 'non-fast-forward push shows help message' '
161
- grep "To prevent you from losing history, non-fast-forward updates were rejected" \
162
- output
160
+ test_expect_success 'non-fast-forward push shows help message' '
161
+ test_i18ngrep "To prevent you from losing history, non-fast-forward updates were rejected" output
162
'
163
}
t/t2019-checkout-ambiguous-ref.sh
+6
-6
@@ -29,9 +29,9 @@ test_expect_success 'checkout chooses branch over tag' '
29
test_cmp expect file
30
'
31
32
-test_expect_success C_LOCALE_OUTPUT 'checkout reports switch to branch' '
33
- grep "Switched to branch" stderr &&
34
- ! grep "^HEAD is now at" stderr
32
+test_expect_success 'checkout reports switch to branch' '
33
+ test_i18ngrep "Switched to branch" stderr &&
34
+ test_i18ngrep ! "^HEAD is now at" stderr
35
'
36
37
test_expect_success 'checkout vague ref succeeds' '
@@ -51,9 +51,9 @@ test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' '
51
test_cmp expect file
52
'
53
54
-test_expect_success VAGUENESS_SUCCESS,C_LOCALE_OUTPUT 'checkout reports switch to branch' '
55
- grep "Switched to branch" stderr &&
56
- ! grep "^HEAD is now at" stderr
54
+test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' '
55
+ test_i18ngrep "Switched to branch" stderr &&
56
+ test_i18ngrep ! "^HEAD is now at" stderr
57
'
58
59
test_done