From db4a2daf28303a1be8527844155cc0895cb51ac3 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Tue, 22 Jul 2014 16:14:22 -0700
Subject: [PATCH] simplify travis config

---
 .travis.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1b0d01af4..83b34f6eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,6 @@ compiler:
 addons:
   postgresql: "9.3"
 
-env:
-  - TESTS_TO_RUN=python BINDINGS=python CPP_TESTS=false BENCHMARK=false DEMO=False
-  - TESTS_TO_RUN=visual BINDINGS=python CPP_TESTS=false BENCHMARK=false DEMO=False
-  - TESTS_TO_RUN=cpp BINDINGS=none CPP_TESTS=true BENCHMARK=true DEMO=True
-
 before_install:
  - nproc
  - free
@@ -23,9 +18,7 @@ before_install:
  # more recent boost
  - sudo add-apt-repository -y ppa:boost-latest/ppa
  - sudo apt-get update -y
- # upgrade compilers
- - sudo apt-get install -y gcc-4.8 g++-4.8
- - sudo apt-get install -y make boost1.55 libgdal-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
+ - sudo apt-get install -y gcc-4.8 g++-4.8 make boost1.55 libgdal-dev python-nose libicu-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libproj-dev libcairo-dev python-cairo-dev libsqlite3-dev
  - wget http://mapnik.s3.amazonaws.com/deps/harfbuzz-0.9.32.tar.bz2
  - tar xf harfbuzz-0.9.32.tar.bz2
  - cd harfbuzz-0.9.32
@@ -35,14 +28,14 @@ before_install:
 
 install:
  - if [[ "${CXX}" == 'g++' ]]; then export CXX="g++-4.8" && export CC="gcc-4.8"; fi;
- - ./configure CXX="${CXX}" CC="${CC}" DEMO=${DEMO} BINDINGS=${BINDINGS} BENCHMARK=${BENCHMARK} CPP_TESTS=${CPP_TESTS} CAIRO=True FAST=True
+ - ./configure CXX="${CXX}" CC="${CC}" DEMO=True BENCHMARK=True CPP_TESTS=True CAIRO=True FAST=True
  - JOBS=2 make
 
 before_script:
- - make test-$TESTS_TO_RUN
+ - make test
 
 script:
- - if [[ "${BENCHMARK}" == true ]]; then make bench; fi;
+ - make bench
 
 notifications:
   irc: