From 4ce6e43140819588d2e47c22ca13c05a8030f57d Mon Sep 17 00:00:00 2001
From: Jeff Donahue <jeff.donahue@gmail.com>
Date: Mon, 8 Sep 2014 11:11:41 +0200
Subject: restore "red X" build failures in Travis

---
 .travis.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 46dfc117..3deb45a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,19 +16,16 @@ compiler: gcc
 
 before_install:
   - export NUM_THREADS=4
-  - alias make="make --jobs=$NUM_THREADS"
   - export SCRIPTS=./scripts/travis
-  - set -e  # fail when a script fails
 
 install:
-  - source $SCRIPTS/travis_install.sh
+  - sudo -E $SCRIPTS/travis_install.sh
 
 before_script:
   - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-  - if ! $WITH_CMAKE; then source $SCRIPTS/travis_setup_makefile_config.sh; fi
+  - if ! $WITH_CMAKE; then $SCRIPTS/travis_setup_makefile_config.sh; fi
 
-script:
-  - if $WITH_CUDA; then source $SCRIPTS/travis_build.sh; else source $SCRIPTS/travis_build_and_test.sh; fi
+script: $SCRIPTS/travis_build_and_test.sh
 
 notifications:
 # Emails are sent to the committer's git-configured email address by default,
-- 
cgit v1.2.3