Skip to content

Commit 1c36a35

Browse files
committed
Merge pull request #499 from klickverbot/travis
Travis CI fixes
2 parents e440bb0 + 0ade0d6 commit 1c36a35

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

.travis.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
language: cpp
22
install:
3+
# LLVM 3.2
34
- sudo sudo sh -c "echo 'deb http://archive.ubuntu.com/ubuntu/ precise-proposed restricted main multiverse universe' >> /etc/apt/sources.list"
5+
6+
# LLVM 3.4 snapshots
47
- sudo sudo sh -c "echo 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' >> /etc/apt/sources.list"
58
- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
9+
10+
# Some random Launchpad PPA for LLVM 3.3, should consder replacing this with
11+
# the official Clang binary package from the llvm.org download page.
12+
- echo yes | sudo add-apt-repository ppa:nmi/llvm-3.3
13+
614
- sudo apt-get update -qq
715
- sudo apt-get install -qq $LLVM_PACKAGE libconfig++8-dev
816
- if [[ "${OPTS}" == *MULTILIB*ON* ]]; then sudo apt-get install -qq gcc-multilib libcurl3:i386 ; fi
@@ -23,8 +31,9 @@ matrix:
2331
script:
2432
- cmake $OPTS .
2533
- make
26-
- bin/ldc2 -version # For environment info.
27-
- ctest --output-on-failure -R $TESTSUITE_FILTER
34+
# Outputs some environment info, plus makes sure we only run the test suite
35+
# if we could actually build the executable.
36+
- bin/ldc2 -version && ctest --output-on-failure -R $TESTSUITE_FILTER
2837

2938
notifications:
3039
# Temporarily disabled due to time limit problems.

0 commit comments

Comments
 (0)