aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorChris Fallin <cfallin@c1f.net>2015-05-14 15:05:08 -0700
committerChris Fallin <cfallin@c1f.net>2015-05-14 15:05:08 -0700
commite96b5b6b7bc680dbc85627bd7b8360687e87d847 (patch)
treed7c873dc09cae34baa155d9a4fd0e2bbb53e8edb /.travis.yml
parentaa8c951ef58dbc6a5c1ec8118980938f20916ce8 (diff)
parent20e94b24ddada6c0bbb05b6e81ed1342ec4dc5b1 (diff)
downloadprotobuf-e96b5b6b7bc680dbc85627bd7b8360687e87d847.tar.gz
protobuf-e96b5b6b7bc680dbc85627bd7b8360687e87d847.tar.bz2
protobuf-e96b5b6b7bc680dbc85627bd7b8360687e87d847.zip
Merge pull request #385 from cfallin/travis-refactor
Refactor Travis tests: split configs and run in parallel.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml34
1 files changed, 19 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml
index 4f513653..bfe63d1d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,25 @@
-sudo: false
-language: java
-jdk:
- - openjdk6
- - openjdk7
- - oraclejdk7
+sudo: required
+language: cpp
os:
- linux
- osx
script:
- - ./autogen.sh && ./configure && make -j2
- - cd java && mvn test && cd ..
- - cd javanano && mvn test && cd ..
- - cd python && python setup.py build && python setup.py test && cd ..
- - export LD_LIBRARY_PATH=../src/.libs
- - cd python && python setup.py build --cpp_implementation && python setup.py test --cpp_implementation && cd ..
- - cd ruby && sh travis-test.sh && cd ..
- - cd conformance && make test_java && cd ..
- - make distcheck -j2
+ - ./travis.sh $CONFIG
+env:
+ - CONFIG=cpp
+ - CONFIG=cpp_distcheck
+ - CONFIG=java_jdk6
+ - CONFIG=java_jdk7
+ - CONFIG=java_oracle7
+ - CONFIG=javanano_jdk6
+ - CONFIG=javanano_jdk7
+ - CONFIG=javanano_oracle7
+ - CONFIG=python
+ - CONFIG=python_cpp
+ - CONFIG=ruby19
+ - CONFIG=ruby20
+ - CONFIG=ruby21
+ - CONFIG=ruby22
+ - CONFIG=jruby
notifications:
email: false