aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-04-29 21:50:17 -0700
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-04-29 21:50:17 -0700
commit7d9df1b23a456ad4e7b9d665d8acd2ab81f8e4cd (patch)
treeceec683f8b7eaf86748add7d212d18a17d1e1ced /.travis.yml
parent68180a2b92d4d2c09a098cf6fa75f53590147f35 (diff)
Merge C/C++ build steps on Travis
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 7d8634506c..11adf0442e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,12 @@ env:
- COVERALLS_PARALLEL=true
matrix:
- CONFIG=opt TEST=sanity
- - CONFIG=dbg TEST=c
- - CONFIG=dbg TEST=c++
- - CONFIG=opt TEST=c
- - CONFIG=opt TEST=c++
+ - CONFIG=dbg TEST="c c++"
+ - CONFIG=opt TEST="c c++"
- CONFIG=opt TEST=node
- CONFIG=opt TEST=ruby
- CONFIG=opt TEST=python
- - CONFIG=gcov TEST=c
- - CONFIG=gcov TEST=c++
+ - CONFIG=gcov TEST="c c++"
- USE_GCC=4.4 CONFIG=opt TEST=build
- USE_GCC=4.5 CONFIG=opt TEST=build
script: