aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYilun Chong <yilunchong@google.com>2018-07-12 14:22:14 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2018-07-15 21:01:48 -0700
commitc1e6c4df738d62fbb9eff3f735292d349655ab03 (patch)
tree142b6a0368c4977c66bfb326ec988f235667f010
parent22503a01722939385a7584c3b65f1c43dc5b2ef8 (diff)
downloadprotobuf-c1e6c4df738d62fbb9eff3f735292d349655ab03.tar.gz
protobuf-c1e6c4df738d62fbb9eff3f735292d349655ab03.tar.bz2
protobuf-c1e6c4df738d62fbb9eff3f735292d349655ab03.zip
fix linux kokoro build in docker
-rwxr-xr-xkokoro/linux/pull_request_in_docker.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/kokoro/linux/pull_request_in_docker.sh b/kokoro/linux/pull_request_in_docker.sh
index df3636cc..38c3d65c 100755
--- a/kokoro/linux/pull_request_in_docker.sh
+++ b/kokoro/linux/pull_request_in_docker.sh
@@ -53,7 +53,7 @@ $TIME_CMD $TEST_SCRIPT cpp > >(tee $CPP_STDOUT) 2> >(tee $CPP_STDERR >&2)
parallel --results $LOG_OUTPUT_DIR --joblog $OUTPUT_DIR/joblog $TEST_SCRIPT ::: \
$TEST_SET \
- || true # Process test results even if tests fail.
+ || FAILED="true" # Process test results even if tests fail.
cat $OUTPUT_DIR/joblog
@@ -67,3 +67,7 @@ TESTOUTPUT_XML_FILE=$COPY_FROM_DOCKER/sponge_log.xml
python $MY_DIR/make_test_output.py $OUTPUT_DIR > $TESTOUTPUT_XML_FILE
ls -l $TESTOUTPUT_XML_FILE
+
+if [ "$FAILED" == "true" ]; then
+ exit 1
+fi