aboutsummaryrefslogtreecommitdiff
path: root/tools/run_tests
diff options
context:
space:
mode:
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-xtools/run_tests/jenkins.sh9
-rwxr-xr-xtools/run_tests/tests.sh3
2 files changed, 10 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 \
diff --git a/tools/run_tests/tests.sh b/tools/run_tests/tests.sh
index db499755..5281cd20 100755
--- a/tools/run_tests/tests.sh
+++ b/tools/run_tests/tests.sh
@@ -152,6 +152,9 @@ build_javanano_oracle7() {
}
internal_install_python_deps() {
+ if [ "$TRAVIS" != "true" ]; then
+ return;
+ fi
# Install tox (OS X doesn't have pip).
if [ $(uname -s) == "Darwin" ]; then
sudo easy_install tox