From 738393b2c0690bcb92a6689f3a07d518289c4dde Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Thu, 18 Feb 2016 20:10:23 -0800
Subject: Try running multiple tests in a row.

---
 tools/run_tests/jenkins.sh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'tools/run_tests/jenkins.sh')

diff --git a/tools/run_tests/jenkins.sh b/tools/run_tests/jenkins.sh
index b90c099f..e174a209 100755
--- a/tools/run_tests/jenkins.sh
+++ b/tools/run_tests/jenkins.sh
@@ -1,17 +1,23 @@
 #!/bin/bash
 
 MY_DIR="$(dirname "$0")"
+TEST_SCRIPT=$MY_DIR/tests.sh
 BUILD_DIR=/tmp/protobuf
 
-source $MY_DIR/tests.sh
-
 # Set value used in tests.sh.
 PARALLELISM=-j8
 
+set -x  # display all commands
+
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 git clone /var/local/jenkins/protobuf
 cd protobuf
 
-build_cpp
+# If protoc fails to build, we can't test anything else.
+$TEST_SCRIPT cpp || exit 1
+
+# Other tests can fail and we keep on going.
+$TEST_SCRIPT java_jdk6
+$TEST_SCRIPT java_jdk7
-- 
cgit v1.2.3