1 files changed, 90 insertions, 44 deletions

diff --git a/.travis.yml b/.travis.yml
index 1fda1449..93e59131 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,58 +1,104 @@
-sudo: required
-dist: trusty
 language: c
 compiler:
   - gcc
   - clang
 
+addons:
+  apt:
+    sources:
+      - avsm
+    packages:
+      - check
+      - libvpx-dev
+      - opam
+
+cache:
+  directories:
+    - $HOME/cache
+
 before_script:
-  - sudo add-apt-repository ppa:avsm/ocaml42+opam12 -y
-  - sudo apt-get update -qq
-  - sudo apt-get install ocaml opam astyle -qq
-  - sudo apt-get install libconfig-dev libvpx-dev libopus-dev check -qq
-  # build apidsl
-  - git clone https://github.com/iphydf/apidsl
-  - cd apidsl
-  - export OPAMYES=1
-  - opam init
-  - opam install ocamlfind ppx_deriving menhir
+  - pushd ..
+  - CACHE_DIR=$HOME/cache
+  - export OPAMROOT=$CACHE_DIR/.opam
+  - export PKG_CONFIG_PATH=$CACHE_DIR/lib/pkgconfig
+  # Set up opam.
+  - opam init -y
   - eval `opam config env`
-  - make -j3
-  - cd ..
-  # install sodium, as it's not in Ubuntu Trusty
-  - git clone git://github.com/jedisct1/libsodium.git
-  - cd libsodium
-  - git checkout tags/1.0.8
-  - ./autogen.sh
-  - ./configure
-  - make -j3
-  - sudo make install
-  - cd ..
-  - sudo ldconfig
+  # Install required opam packages.
+  - opam install -y ocamlfind ppx_deriving menhir
+  # Build apidsl.
+  - git clone --depth=1 https://github.com/iphydf/apidsl
+  - make -C apidsl
+  # Install cpp-coveralls to upload test coverage results.
+  - pip install --user cpp-coveralls
+  # Install astyle (version in ubuntu-precise too old).
+  - ASTYLE=$CACHE_DIR/astyle/build/gcc/bin/astyle
+  - >
+      [ -f $ASTYLE ] || {
+        wget -O astyle.tar.gz http://sourceforge.net/projects/astyle/files/astyle/astyle%202.05.1/astyle_2.05.1_linux.tar.gz/download
+        tar -xf astyle.tar.gz -C $CACHE_DIR
+        make -C $CACHE_DIR/astyle/build/gcc
+      }
+  # Install libsodium (not in ubuntu-precise).
+  - >
+      [ -f $CACHE_DIR/lib/libsodium.a ] || {
+        git clone --depth=1 --branch=stable https://github.com/jedisct1/libsodium
+        cd libsodium
+        ./autogen.sh
+        ./configure --prefix=$CACHE_DIR
+        make install -j3
+        cd ..
+      }
+  # Install libconfig (version in ubuntu-precise too old).
+  - >
+      [ -f $CACHE_DIR/lib/libconfig.a ] || {
+        git clone --depth=1 --branch=REL1_6_STABLE https://github.com/hyperrealm/libconfig
+        cd libconfig
+        autoreconf -fi
+        ./configure --prefix=$CACHE_DIR
+        touch lib/scanner.l
+        make install -j3
+        cd ..
+      }
+  # Install libopus (not in ubuntu-precise).
+  - >
+      [ -f $CACHE_DIR/lib/libopus.a ] || {
+        git clone --depth=1 --branch=1.1.2 https://github.com/xiph/opus
+        cd opus
+        ./autogen.sh
+        ./configure --prefix=$CACHE_DIR
+        make install -j3
+        cd ..
+      }
+  - popd
 
 script:
-  # check if toxcore.h and toxav.h match apidsl tox.in.h and toxav.in.h
-  # tox.h
-  - ./apidsl/_build/apigen.native ./other/apidsl/tox.in.h > tox.h
-  - astyle --options=./other/astyle/astylerc tox.h
-  - diff -u tox.h ./toxcore/tox.h
-  # toxav.h
-  - ./apidsl/_build/apigen.native ./other/apidsl/toxav.in.h > toxav.h
-  - astyle --options=./other/astyle/astylerc toxav.h
-  - diff -u toxav.h ./toxav/toxav.h
-  # build toxcore and run tests
+  # Check if toxcore.h and toxav.h match apidsl tox.in.h and toxav.in.h.
+  - ../apidsl/_build/apigen.native ./other/apidsl/tox.in.h   | $ASTYLE --options=./other/astyle/astylerc > toxcore/tox.h
+  - ../apidsl/_build/apigen.native ./other/apidsl/toxav.in.h | $ASTYLE --options=./other/astyle/astylerc > toxav/toxav.h
+  - git diff --exit-code
+  # Build toxcore and run tests.
   - ./autogen.sh
-  - CFLAGS="-Ofast -Wall -Wextra" ./configure --enable-daemon --enable-ntox
+  - >
+      ./configure \
+        --with-libsodium-libs=$CACHE_DIR/lib \
+        --with-libsodium-headers=$CACHE_DIR/include \
+        --enable-daemon \
+        --enable-ntox \
+        CFLAGS="-O0 -Wall -Wextra -fprofile-arcs -ftest-coverage"
   - make
-  - make check
-  - cat build/test-suite.log
+  - make check || true
+  - if [ -f build/test-suite.log ]; then cat build/test-suite.log; fi
   - make dist
 
-notifications:
-  email: false
+after_script:
+  - coveralls --exclude auto_tests --exclude other --exclude testing --gcov-options '\-lp'
 
-  irc:
-    channels:
-      - "chat.freenode.net#tox-dev"
-    on_success: always
-    on_failure: always
+#notifications:
+#  email: false
+#
+#  irc:
+#    channels:
+#      - "chat.freenode.net#tox-dev"
+#    on_success: always
+#    on_failure: always