From 0b931bcd53897954cf96cd8075bb6fc16651559d Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Fri, 19 Feb 2016 12:33:17 -0800
Subject: Add another test (javanano), but run it in parallel.

---
 tools/docker/Dockerfile    |  1 +
 tools/run_tests/jenkins.sh | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 8770d16e..7d9def05 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -47,6 +47,7 @@ RUN apt-get update && apt-get install -y \
   libgtest-dev \
   libtool \
   make \
+  parallel \
   strace \
   python-dev \
   python-setuptools \
diff --git a/tools/run_tests/jenkins.sh b/tools/run_tests/jenkins.sh
index bbca3389..c0d02ddc 100755
--- a/tools/run_tests/jenkins.sh
+++ b/tools/run_tests/jenkins.sh
@@ -7,6 +7,7 @@ BUILD_DIR=/tmp/protobuf
 # Set value used in tests.sh.
 PARALLELISM=-j8
 
+set -e  # exit immediately on error
 set -x  # display all commands
 
 rm -rf $BUILD_DIR
@@ -15,9 +16,15 @@ cd $BUILD_DIR
 git clone /var/local/jenkins/protobuf
 cd protobuf
 
-# If protoc fails to build, we can't test anything else.
-$TEST_SCRIPT cpp || exit 1
+OUTPUT_DIR=`mktemp -d`
+mkdir -p $OUTPUT_DIR/1
 
-# Other tests can fail and we keep on going.
-#$TEST_SCRIPT java_jdk6
-$TEST_SCRIPT java_jdk7
+# cpp build needs to run first, non-parallelized, so that protoc is available
+# for other builds.
+$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
-- 
cgit v1.2.3