i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Apr 12, 2011 at 16:36 UTC
476cca692c76a9a771fd59e62a2ce76cf4092e87
2 files changed
+8
-8
t/t7102-reset.sh
+2
-2
@@ -423,10 +423,10 @@ Unstaged changes after reset:
423
M file2
424
EOF
425
426
-test_expect_success C_LOCALE_OUTPUT '--mixed refreshes the index' '
426
+test_expect_success '--mixed refreshes the index' '
427
echo 123 >> file2 &&
428
git reset --mixed HEAD > output &&
429
- test_cmp expect output
429
+ test_i18ncmp expect output
430
'
431
432
test_expect_success 'disambiguation (1)' '
t/t7110-reset-merge.sh
+6
-6
@@ -233,11 +233,11 @@ test_expect_success '"reset --merge HEAD^" is ok with pending merge' '
233
# working index HEAD target working index HEAD
234
# ----------------------------------------------------
235
# file1: X U B C --keep (disallowed)
236
-test_expect_success C_LOCALE_OUTPUT '"reset --keep HEAD^" fails with pending merge' '
236
+test_expect_success '"reset --keep HEAD^" fails with pending merge' '
237
git reset --hard third &&
238
test_must_fail git merge branch1 &&
239
test_must_fail git reset --keep HEAD^ 2>err.log &&
240
- grep "middle of a merge" err.log
240
+ test_i18ngrep "middle of a merge" err.log
241
'
242
243
# The next test will test the following:
@@ -259,11 +259,11 @@ test_expect_success '"reset --merge HEAD" is ok with pending merge' '
259
# working index HEAD target working index HEAD
260
# ----------------------------------------------------
261
# file1: X U B B --keep (disallowed)
262
-test_expect_success C_LOCALE_OUTPUT '"reset --keep HEAD" fails with pending merge' '
262
+test_expect_success '"reset --keep HEAD" fails with pending merge' '
263
git reset --hard third &&
264
test_must_fail git merge branch1 &&
265
test_must_fail git reset --keep HEAD 2>err.log &&
266
- grep "middle of a merge" err.log
266
+ test_i18ngrep "middle of a merge" err.log
267
'
268
269
test_expect_success '--merge is ok with added/deleted merge' '
@@ -280,7 +280,7 @@ test_expect_success '--merge is ok with added/deleted merge' '
280
git diff --exit-code --cached
281
'
282
283
-test_expect_success C_LOCALE_OUTPUT '--keep fails with added/deleted merge' '
283
+test_expect_success '--keep fails with added/deleted merge' '
284
git reset --hard third &&
285
rm -f file2 &&
286
test_must_fail git merge branch3 &&
@@ -289,7 +289,7 @@ test_expect_success C_LOCALE_OUTPUT '--keep fails with added/deleted merge' '
289
git diff --exit-code file3 &&
290
git diff --exit-code branch3 file3 &&
291
test_must_fail git reset --keep HEAD 2>err.log &&
292
- grep "middle of a merge" err.log
292
+ test_i18ngrep "middle of a merge" err.log
293
'
294
295
test_done