Switching travis over to using the containers infrastructure.

diff --git a/.travis.yml b/.travis.yml
index b11e815a28b2ef9ee85b157c0235f606147d3c7f..5ee1410f1dbac6ad2adc48cdaab4d6ec100c0131 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,11 @@
 language: cpp
-cache: apt
+cache:
+ apt: true
+ directories:
+  - $HOME/cxxtest
+
+sudo: false
+
 compiler:
  - gcc
  - clang
@@ -10,23 +16,23 @@ env:
  - TRAVIS_LFSC=yes
  - TRAVIS_LFSC=yes TRAVIS_LFSC_DISTCHECK=yes
 addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - libgmp-dev
-    - libboost-dev
-    - libboost-thread-dev
-    - swig
-    - libcln-dev
-    - openjdk-7-jdk
-before_install:
-# dhart/ppa is for cxxtest package, which doesn't appear officially until quantal
-# - travis_retry sudo apt-get install -qq libgmp-dev antlr3 libantlr3c-dev libboost-dev libboost-thread-dev swig2.0 libcln-dev openjdk-7-jdk
- - travis_retry sudo apt-add-repository -y ppa:dhart/ppa
- - travis_retry sudo apt-get update -qq
- - travis_retry sudo apt-get install -qq antlr3 libantlr3c-dev
- - travis_retry sudo apt-get install -qq --force-yes cxxtest
+ apt:
+  sources:
+  - ubuntu-toolchain-r-test
+  packages:
+  - libgmp-dev
+  - libboost-dev
+  - libboost-thread-dev
+  - swig
+  - libcln-dev
+  - 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
 before_script:
  - export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64
  - export PATH=$PATH:$JAVA_HOME/bin
@@ -38,7 +44,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 --enable-proof --with-portfolio $TRAVIS_CVC4_CONFIG ||
+     ./configure --enable-unit-testing --enable-proof --with-portfolio $TRAVIS_CVC4_CONFIG  CXXTEST=$HOME/cxxtest ||
        (echo; cat builds/config.log; error "CONFIGURE FAILED");
    }
    error() {
@@ -48,7 +54,7 @@ script:
      exit 1;
    }
    makeDistcheck() {
-     make -j2 distcheck CVC4_REGRESSION_ARGS='--no-early-exit' ||
+     make -j2 distcheck CVC4_REGRESSION_ARGS='--no-early-exit' DISTCHECK_CONFIGURE_FLAGS="CXXTEST=$HOME/cxxtest" ||
        error "DISTCHECK (WITH NEWTHEORY TESTS) FAILED";
    }
    makeCheck() {
@@ -95,4 +101,4 @@ matrix:
 notifications:
   email:
     on_success: change
-    on_failure: always
+    on_failure: always
\ No newline at end of file