From f763e8bc4acf9f790a76a1447cc35c5f04c9644b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arttu=20Yl=C3=A4-Outinen?= <arttu.yla-outinen@tut.fi>
Date: Mon, 21 Dec 2015 14:59:09 +0200
Subject: [PATCH] Update Travis tests to use autotools.

---
 .travis-script.sh | 18 +++++++++---------
 .travis.yml       | 15 +++++++--------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/.travis-script.sh b/.travis-script.sh
index 194eb9e9..10096d93 100755
--- a/.travis-script.sh
+++ b/.travis-script.sh
@@ -1,20 +1,20 @@
 #!/bin/sh
 set -ev
 
+./autogen.sh
+./configure
+make
+
 if [ -n "$VALGRIND_TEST" ]; then
-  cd src
-  make debug
-  valgrind --leak-check=full --error-exitcode=1 ./kvazaar_debug -i ../mandelbrot_${TEST_DIM}.yuv --input-res=${TEST_DIM} -o /dev/null $VALGRIND_TEST
+  libtool execute valgrind --leak-check=full --error-exitcode=1 -- \
+    src/kvazaar -i mandelbrot_${TEST_DIM}.yuv --input-res=${TEST_DIM} -o /dev/null \
+    $VALGRIND_TEST
 elif [ -n "$EXPECTED_STATUS" ]; then
-  cd src
-  make cli
   set +e
-  ./kvazaar $PARAMS
+  libtool execute src/kvazaar $PARAMS
   EXIT_STATUS=$?
   set -e
   [ "$EXIT_STATUS" = "$EXPECTED_STATUS" ]
 else
-  cd src
-  make
-  make tests
+  make check
 fi
diff --git a/.travis.yml b/.travis.yml
index 811bb091..3c694a2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: c
 
 env:
   global:
-  - AS=nasm
   - KVZ_DISABLE_AVX2=1
   - TEST_DIM=264x130
   - TEST_FRAMES=10
@@ -15,17 +14,14 @@ matrix:
   
   include:
     - compiler: clang
-      env: KVZ_DISABLE_AVX2=""
     - compiler: gcc-4.8
-      env: KVZ_DISABLE_AVX2=""
 
     # Check for external symbols without kvz_ prefix.
     - compiler: gcc-4.8
-      env: KVZ_DISABLE_AVX2=""
       script:
-        - cd src
-        - make libkvazaar.a
-        - (! nm -go --defined-only libkvazaar.a | grep -v ' kvz_')
+        - ./autogen.sh
+        - ./configure && make
+        - (! nm -go --defined-only src/.libs/libkvazaar.a | grep -v ' kvz_')
 
     # These valgrind tests are slow, so they are performed with the minimum
     # number of small frames and fast settings.
@@ -58,7 +54,7 @@ matrix:
     - env: TEST_FRAMES=20 VALGRIND_TEST="--gop=8 -p0 --threads=2 --wpp --owf=0 --rd=0 --no-rdoq --no-deblock --no-sao --no-signhide --subme=0 --pu-depth-inter=1-3 --pu-depth-intra=2-3"
 
     # Tests trying to use invalid input dimensions
-    - env: EXPECTED_STATUS=1 PARAMS="-i kvazaar --input-res=1x65 -o /dev/null"
+    - env: EXPECTED_STATUS=1 PARAMS="-i src/kvazaar --input-res=1x65 -o /dev/null"
 
 addons:
   apt:
@@ -66,11 +62,14 @@ addons:
     - ubuntu-toolchain-r-test
 
     packages:
+    - autoconf
     - gcc
     - gcc-4.8
+    - libtool
     - nasm
     - p7zip-full
     - valgrind
+    - yasm
 
 install:
   - source .travis-install.sh