Disable valgrind tests on Travis CI for Mac OS X

* .travis.yml: Do not install valgrind in OS X
* .travis.sh: Disable valgrind tests for OS X
This commit is contained in:
Tim Rühsen
2016-01-24 20:04:21 +01:00
parent 5898029aca
commit c1bcbcc623
2 changed files with 7 additions and 6 deletions

View File

@ -1,19 +1,20 @@
#!/bin/bash
./autogen.sh || exit 1
./configure --enable-valgrind-tests || exit 1
./configure || exit 1
make -j3 || exit 1
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
make install || exit 1
else
export VALGRIND_TESTS=1
fi
export VALGRIND_TESTS=1
make check -j3
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
cat tests/test.log
#if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
# cat tests/test.log
# ls -la tests/.test_*
# for log in tests/*.log; do
# echo -e "\n#### $log ####"
# cat $log
# done
fi
#fi
make distcheck

View File

@ -38,7 +38,7 @@ before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated libtool || brew upgrade libtool; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install doxygen; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew outdated gettext || brew upgrade gettext; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install valgrind; fi
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install valgrind; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install flex; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libidn; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install xz; fi