commit 0f8c25d1050b8d20ed73b72e5b36344fb9b497dc
author Josh Haberman <jhaberman@gmail.com> Fri Feb 19 09:11:38 2016 -0800
committer Josh Haberman <jhaberman@gmail.com> Wed Mar 02 14:51:09 2016 -0800
tree 59b188839cefee016637cdbef80fb2511112087e
parent 738393b2c0690bcb92a6689f3a07d518289c4dde

Properly add JDK deps in the Docker image.

tools/run_tests/tests.sh

diff --git a/tools/run_tests/tests.sh b/tools/run_tests/tests.sh
index 718d6de..db49975 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 @@
   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)