diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2016-02-19 12:33:17 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2016-03-02 14:51:09 -0800 |
| commit | 0b931bcd53897954cf96cd8075bb6fc16651559d (patch) | |
| tree | 922d4b9133575020f8ddeb2047bfd2cafb2377a8 /tools/run_tests | |
| parent | 0f8c25d1050b8d20ed73b72e5b36344fb9b497dc (diff) | |
| download | protobuf-0b931bcd53897954cf96cd8075bb6fc16651559d.tar.gz protobuf-0b931bcd53897954cf96cd8075bb6fc16651559d.tar.bz2 protobuf-0b931bcd53897954cf96cd8075bb6fc16651559d.zip | |
Add another test (javanano), but run it in parallel.
Diffstat (limited to 'tools/run_tests')
| -rwxr-xr-x | tools/run_tests/jenkins.sh | 17 |
1 files changed, 12 insertions, 5 deletions
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 |