diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-02-19 09:11:38 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-02 14:51:09 -0800 |
| commit | 0f8c25d1050b8d20ed73b72e5b36344fb9b497dc (patch) | |
| tree | 59b188839cefee016637cdbef80fb2511112087e /tools/run_tests/tests.sh | |
| parent | 738393b2c0690bcb92a6689f3a07d518289c4dde (diff) | |
| download | protobuf-0f8c25d1050b8d20ed73b72e5b36344fb9b497dc.tar.gz protobuf-0f8c25d1050b8d20ed73b72e5b36344fb9b497dc.tar.bz2 protobuf-0f8c25d1050b8d20ed73b72e5b36344fb9b497dc.zip | |
Properly add JDK deps in the Docker image.
Diffstat (limited to 'tools/run_tests/tests.sh')
| -rwxr-xr-x | tools/run_tests/tests.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/run_tests/tests.sh b/tools/run_tests/tests.sh index 718d6de9..db499755 100755 --- a/tools/run_tests/tests.sh +++ b/tools/run_tests/tests.sh @@ -1,5 +1,11 @@ #!/bin/bash +on_travis() { + if [ "$TRAVIS" == "true" ]; then + "$@" + fi +} + # For when some other test needs the C++ main build, including protoc and # libprotobuf. internal_build_cpp() { @@ -75,11 +81,11 @@ use_java() { version=$1 case "$version" in jdk6) - sudo apt-get install openjdk-6-jdk + on_travis sudo apt-get install openjdk-6-jdk export PATH=/usr/lib/jvm/java-6-openjdk-amd64/bin:$PATH ;; jdk7) - sudo apt-get install openjdk-7-jdk + on_travis sudo apt-get install openjdk-7-jdk export PATH=/usr/lib/jvm/java-7-openjdk-amd64/bin:$PATH ;; oracle7) |