aboutsummaryrefslogtreecommitdiff
path: root/tools/run_tests/jenkins.sh
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2016-02-19 12:48:33 -0800
committerJosh Haberman <jhaberman@gmail.com>2016-03-02 14:51:09 -0800
commit483533d3a21a9d689aafb4c259301aa44cef75ed (patch)
tree7acb3a522eae9b4225881ca92f494e69e1ff2c46 /tools/run_tests/jenkins.sh
parent0b931bcd53897954cf96cd8075bb6fc16651559d (diff)
downloadprotobuf-483533d3a21a9d689aafb4c259301aa44cef75ed.tar.gz
protobuf-483533d3a21a9d689aafb4c259301aa44cef75ed.tar.bz2
protobuf-483533d3a21a9d689aafb4c259301aa44cef75ed.zip
Install Python deps in Docker image.
Diffstat (limited to 'tools/run_tests/jenkins.sh')
-rwxr-xr-xtools/run_tests/jenkins.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/run_tests/jenkins.sh b/tools/run_tests/jenkins.sh
index c0d02ddc..1d192aa4 100755
--- a/tools/run_tests/jenkins.sh
+++ b/tools/run_tests/jenkins.sh
@@ -26,5 +26,10 @@ $TEST_SCRIPT cpp | tee $OUTPUT_DIR/1/cpp
# Other tests are run in parallel. The overall run fails if any one of them
# fails.
-# java_jdk6
-parallel $TEST_SCRIPT ::: java_jdk7 javanano_jdk7
+parallel $TEST_SCRIPT ::: \
+ java_jdk7 \
+ javanano_jdk7 \
+ python \
+ python_cpp
+
+# java_jdk6 \