From d80325170e92273bad6a0b32b7249a81445b4672 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Wed, 9 Oct 2013 19:30:35 +0200 Subject: [PATCH 1/2] Travis: Avoid running testsuite when build didn't succeed. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3a28485d..1791fef7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,9 @@ matrix: script: - cmake $OPTS . - make - - bin/ldc2 -version # For environment info. - - ctest --output-on-failure -R $TESTSUITE_FILTER + # Outputs some environment info, plus makes sure we only run the test suite + # if we could actually build the executable. + - bin/ldc2 -version && ctest --output-on-failure -R $TESTSUITE_FILTER notifications: # Temporarily disabled due to time limit problems. From 0ade0d6404c42384fe9d390f7d6c61c68a26687f Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Wed, 9 Oct 2013 19:39:26 +0200 Subject: [PATCH 2/2] Travis: Use Launchpad PPA for LLVM 3.3; the llvm.org repo no longer has it. --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1791fef7..8500e8ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,16 @@ language: cpp install: + # LLVM 3.2 - sudo sudo sh -c "echo 'deb http://archive.ubuntu.com/ubuntu/ precise-proposed restricted main multiverse universe' >> /etc/apt/sources.list" + + # LLVM 3.4 snapshots - sudo sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list" - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add - + + # Some random Launchpad PPA for LLVM 3.3, should consder replacing this with + # the official Clang binary package from the llvm.org download page. + - echo yes | sudo add-apt-repository ppa:nmi/llvm-3.3 + - sudo apt-get update -qq - sudo apt-get install -qq $LLVM_PACKAGE libconfig++8-dev - if [[ "${OPTS}" == *MULTILIB*ON* ]]; then sudo apt-get install -qq gcc-multilib libcurl3:i386 ; fi