diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2015-06-09 13:35:41 -0400 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-06-10 08:51:06 -0400 |
| commit | c4d3638f51316731638506f161ed6dfd4597576d (patch) | |
| tree | 2a7e230d12d3efe86fd82a786045b4eb1813b625 | |
| parent | 9cbdaedb86debc56ffec91935ee9546f3c92eb0a (diff) | |
Remove the OS X checks from travis.sh, instead use excludes to not fire up a vm for something we can't test.
| -rw-r--r-- | .travis.yml | 24 | ||||
| -rwxr-xr-x | travis.sh | 14 |
2 files changed, 31 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index cdbd8e1d..4edf3b30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,8 @@ sudo: required +# Note: travis currently does not support listing more than one language so +# this cheats and claims to only be cpp. If they add multiple language +# support, this should probably get updated to install steps and/or +# rvm/gemfile/jdk/etc. entries rather than manually doing the work. language: cpp os: - linux @@ -23,9 +27,27 @@ env: - CONFIG=ruby22 - CONFIG=jruby matrix: - allow_failures: + exclude: + # It's nontrivial to programmatically install a new JDK from the command + # line on OS X, so we rely on testing on Linux for Java code. + - os: osx + env: CONFIG=java_jdk6 + - os: osx + env: CONFIG=java_jdk7 + - os: osx + env: CONFIG=java_oracle7 + - os: osx + env: CONFIG=javanano_jdk6 + - os: osx + env: CONFIG=javanano_jdk7 + - os: osx + env: CONFIG=javanano_oracle7 + # Requires installing mono, currently travis.sh is doing that with apt-get + # which doesn't work on OS X. - os: osx env: CONFIG=csharp + allow_failures: + # These currently do not work on OS X but are being worked on by @haberman. - os: osx env: CONFIG=ruby22 - os: osx @@ -1,5 +1,13 @@ #!/usr/bin/env bash +# Note: travis currently does not support testing more than one language so the +# .travis.yml cheats and claims to only be cpp. If they add multiple language +# support, this should probably get updated to install steps and/or +# rvm/gemfile/jdk/etc. entries rather than manually doing the work. + +# .travis.yml uses matrix.exclude to block the cases where app-get can't be +# use to install things. + build_cpp() { ./autogen.sh ./configure @@ -28,12 +36,6 @@ build_csharp() { } use_java() { - if [ `uname` != "Linux" ]; then - # It's nontrivial to programmatically install a new JDK from the command - # line on OS X, so we rely on testing on Linux for Java code. - echo "Java not tested on OS X." - exit 0 # success - fi version=$1 case "$version" in jdk6) |