summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml21
1 files changed, 7 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml
index 09037ed..2722936 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,14 +12,11 @@ notifications:
on_failure: always
## Are we going to want this on or off?
irc:
- # TMW irc doesn't work for some reason; freenode does ...
- # I'm leaving it like this because it's what I'd like to use.
- channels: "irc.themanaworld.org#tmw-dev"
+ channels: "chat.freenode.net#tmwa"
on_success: always
on_failure: always
## Commands before installing prerequisites
-before_install: export CC=${REAL_CC} CXX=${REAL_CXX}
# before_install: git submodule update --init --recursive
## Install prerequisites
@@ -39,26 +36,22 @@ install:
## Main test script
script:
- - make -k -j2 CC=${REAL_CC} CXX=${REAL_CXX}
+ - make -k -j2 CXX=${REAL_CXX} CPPFLAGS=-DQUIET
## Do something after the main test script
# after_script: ...
### The rest of the file creates a build matrix
-### containing gcc-4.4 through gcc-4.7 and clang-3.1
+### containing gcc-4.6 through gcc-4.7 and clang-3.1
## This doesn't work - travis defaults to plain gcc if unknown
-# compiler: gcc-4.4
-# compiler: gcc-4.5
# compiler: gcc-4.6
# compiler: gcc-4.7
# compiler: clang
## Environment variables to expand the build matrix
-## Needed because compiler: gcc overwrites CC and CXX
+## Needed because 'compiler: gcc' overwrites CXX
env:
- - REAL_CC=gcc-4.4 REAL_CXX=g++-4.4
- - REAL_CC=gcc-4.5 REAL_CXX=g++-4.5
- - REAL_CC=gcc-4.6 REAL_CXX=g++-4.6
- - REAL_CC=gcc-4.7 REAL_CXX=g++-4.7
- - REAL_CC=clang REAL_CXX=clang++
+ - REAL_CXX=g++-4.6
+ - REAL_CXX=g++-4.7
+ - REAL_CXX=clang++