aboutsummaryrefslogtreecommitdiff
path: root/tools/run_tests/jenkins.sh
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2016-02-18 20:10:23 -0800
committerJosh Haberman <jhaberman@gmail.com>2016-03-02 14:51:09 -0800
commit738393b2c0690bcb92a6689f3a07d518289c4dde (patch)
tree309cc3883e29a59f37b2e66ca2934794e9935820 /tools/run_tests/jenkins.sh
parentd33e93b83367ea4dfabeed9cda03bc06a1ff0f6a (diff)
downloadprotobuf-738393b2c0690bcb92a6689f3a07d518289c4dde.tar.gz
protobuf-738393b2c0690bcb92a6689f3a07d518289c4dde.tar.bz2
protobuf-738393b2c0690bcb92a6689f3a07d518289c4dde.zip
Try running multiple tests in a row.
Diffstat (limited to 'tools/run_tests/jenkins.sh')
-rwxr-xr-xtools/run_tests/jenkins.sh12
1 files changed, 9 insertions, 3 deletions
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