diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:08 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-23 13:46:09 +0900 |
| commit | 6a0bc7cf0efbefa5a949d958947e68e29534f04d (patch) | |
| tree | b1b5d9c52347c73b2c9fa8fa2671506b9597e670 /t/t6134-pathspec-in-submodule.sh | |
| parent | Merge branch 'tb/dedup-crlf-tests' (diff) | |
| parent | travis-ci: add job to run tests with GETTEXT_POISON (diff) | |
| download | tgif-6a0bc7cf0efbefa5a949d958947e68e29534f04d.tar.xz | |
Merge branch 'ab/fix-poison-tests'
Update tests to pass under GETTEXT_POISON (a mechanism to ensure
that output strings that should not be translated are not
translated by mistake), and tell TravisCI to run them.
* ab/fix-poison-tests:
travis-ci: add job to run tests with GETTEXT_POISON
travis-ci: setup "prove cache" in "script" step
tests: fix tests broken under GETTEXT_POISON=YesPlease
Diffstat (limited to 't/t6134-pathspec-in-submodule.sh')
| -rwxr-xr-x | t/t6134-pathspec-in-submodule.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh index fd401ca605..99a8982ab1 100755 --- a/t/t6134-pathspec-in-submodule.sh +++ b/t/t6134-pathspec-in-submodule.sh @@ -21,7 +21,7 @@ EOF test_expect_success 'error message for path inside submodule' ' echo a >sub/a && test_must_fail git add sub/a 2>actual && - test_cmp expect actual + test_i18ncmp expect actual ' cat <<EOF >expect @@ -30,7 +30,7 @@ EOF test_expect_success 'error message for path inside submodule from within submodule' ' test_must_fail git -C sub add . 2>actual && - test_cmp expect actual + test_i18ncmp expect actual ' test_done |