summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:09 (GMT)
commit6a0bc7cf0efbefa5a949d958947e68e29534f04d (patch)
treeb1b5d9c52347c73b2c9fa8fa2671506b9597e670 /.travis.yml
parentd13686ff4d17119418a3aa6b901f9c0e640b25b8 (diff)
parentb8e188f6f51fb016eba7eb8a76a109cdadbd4231 (diff)
downloadgit-6a0bc7cf0efbefa5a949d958947e68e29534f04d.zip
git-6a0bc7cf0efbefa5a949d958947e68e29534f04d.tar.gz
git-6a0bc7cf0efbefa5a949d958947e68e29534f04d.tar.bz2
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 '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 10 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 48cb00a..278943d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,11 @@ env:
matrix:
include:
+ - env: GETTEXT_POISON=YesPlease
+ os: linux
+ compiler:
+ addons:
+ before_install:
- env: Windows
os: linux
compiler:
@@ -135,12 +140,14 @@ before_install:
p4 -V | grep Rev.;
echo "$(tput setaf 6)Git-LFS Version$(tput sgr0)";
git-lfs version;
- mkdir -p $HOME/travis-cache;
- ln -s $HOME/travis-cache/.prove t/.prove;
before_script: make --jobs=2
-script: make --quiet test
+script:
+ - >
+ mkdir -p $HOME/travis-cache;
+ ln -s $HOME/travis-cache/.prove t/.prove;
+ make --quiet test;
after_failure:
- >