diff options
author | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
---|---|---|
committer | Jon Skeet <skeet@pobox.com> | 2015-06-17 15:03:47 +0100 |
commit | e2acd854250b449a3fdeef2ad52402c4c5d78259 (patch) | |
tree | a08126762b6c76d56fde8ce443f8dff36408b6e0 /travis.sh | |
parent | d9dc05e500807a6f0cd10d4637c599acc9a6aecf (diff) | |
parent | b36395b2bac88f70070544c325bc09234cb1f1a6 (diff) | |
download | protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.gz protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.tar.bz2 protobuf-e2acd854250b449a3fdeef2ad52402c4c5d78259.zip |
Merged master
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -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) |