aboutsummaryrefslogtreecommitdiffhomepage
path: root/.travis.yml
diff options
context:
space:
mode:
authorGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-04-29 22:45:41 -0700
committerGravatar Nicolas Noble <nicolasnoble@users.noreply.github.com>2015-04-29 22:45:41 -0700
commitceb20ae45c0deaf10b386baf47f19e3c17149589 (patch)
tree9b8e72312002863e73433015dcd0378340959c7c /.travis.yml
parent1685d773ef81420bf747c6988a2ad9baefd126fa (diff)
parent93e4a386a54a90df51f551944e04ad8e62576fab (diff)
Merge pull request #1419 from ctiller/travvy
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 f1839ac174..d29d0e8ab8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,16 +17,13 @@ env:
- NUGET="mono nuget.exe"
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=opt TEST=csharp
- - 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: