diff options
| author | Andres Notzli <andres.noetzli@gmail.com> | 2017-04-20 03:18:58 -0700 |
|---|---|---|
| committer | Andres Notzli <andres.noetzli@gmail.com> | 2017-04-20 03:18:58 -0700 |
| commit | cdde5b9a6cab56882be75524a364528e4c17cd34 (patch) | |
| tree | 575bbfe1c4fa674912e58a6c428dd8f5a7e9ac74 /.travis.yml | |
| parent | 61e18b897f0db2fa99c397cc0f5b8202a8baaf7c (diff) | |
Add cxxtest as packagecxxtest_pkg
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 1ca15d50e..2878144e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: cpp cache: apt: true - directories: - - $HOME/cxxtest sudo: required dist: trusty @@ -36,11 +34,7 @@ addons: - openjdk-7-jdk - antlr3 - libantlr3c-dev -install: -# Download and cache a copy of cxxtest until it appears officially in quantal. - - wget http://sourceforge.net/projects/cxxtest/files/cxxtest/4.3/cxxtest-4.3.tar.gz - - tar -xzvf cxxtest-4.3.tar.gz - - cp -vRT cxxtest-4.3 $HOME/cxxtest + - cxxtest before_script: - export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 - export PATH=$PATH:$JAVA_HOME/bin @@ -52,7 +46,7 @@ script: normal="$(echo -e '\033[0m')" red="$normal$(echo -e '\033[01;31m')" green="$normal$(echo -e '\033[01;32m')" configureCVC4() { echo "CVC4 config - $TRAVIS_CVC4_CONFIG"; - ./configure --enable-unit-testing $TRAVIS_CVC4_CONFIG CXXTEST=$HOME/cxxtest || + ./configure --enable-unit-testing $TRAVIS_CVC4_CONFIG || (echo; echo "Trying to print config.log"; cat builds/config.log; error "CONFIGURE FAILED"); } error() { @@ -62,7 +56,7 @@ script: exit 1; } makeDistcheck() { - make V=1 -j2 distcheck CVC4_REGRESSION_ARGS='--no-early-exit' DISTCHECK_CONFIGURE_FLAGS="CXXTEST=$HOME/cxxtest" || + make V=1 -j2 distcheck CVC4_REGRESSION_ARGS='--no-early-exit' || error "DISTCHECK (WITH NEWTHEORY TESTS) FAILED"; } makeCheck() { @@ -114,7 +108,7 @@ matrix: compiler: gcc before_install: echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- env: - - TRAVIS_COVERITY=yes CVC4_REGRESSION_ARGS='--no-early-exit' CXXTEST="$HOME/cxxtest" + - TRAVIS_COVERITY=yes CVC4_REGRESSION_ARGS='--no-early-exit' addons: # Need to duplicate as addons will be over written. apt: |