| Index: third_party/grpc/tools/jenkins/run_jenkins.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/tools/jenkins/run_jenkins.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 55%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| copy to third_party/grpc/tools/jenkins/run_jenkins.sh
|
| index 4206831cb5135d5e03928bf9d995b2bf9e156018..da6ca698095dff0e06b25bdb41b7dd669dcc29e4
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| +++ b/third_party/grpc/tools/jenkins/run_jenkins.sh
|
| @@ -1,4 +1,5 @@
|
| -# Copyright 2012, Google Inc.
|
| +#!/usr/bin/env bash
|
| +# Copyright 2015-2016, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -26,23 +27,44 @@
|
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| +#
|
| +# This script is invoked by Jenkins and triggers a test run based on
|
| +# env variable settings.
|
| +#
|
| +# Setting up rvm environment BEFORE we set -ex.
|
| +[[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh
|
| +# To prevent cygwin bash complaining about empty lines ending with \r
|
| +# we set the igncr option. The option doesn't exist on Linux, so we fallback
|
| +# to just 'set -ex' there.
|
| +# NOTE: No empty lines should appear in this file before igncr is set!
|
| +set -ex -o igncr || set -ex
|
|
|
| +if [ "$platform" == "linux" ]
|
| +then
|
| + PLATFORM_SPECIFIC_ARGS="--use_docker --measure_cpu_costs"
|
| +elif [ "$platform" == "freebsd" ]
|
| +then
|
| + export MAKE=gmake
|
| +fi
|
|
|
| -_GOODBYE_MESSAGE = u'Goodbye'
|
| -
|
| +unset platform # variable named 'platform' breaks the windows build
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - request.ws_extension_processors = []
|
| +python tools/run_tests/run_tests.py \
|
| + $PLATFORM_SPECIFIC_ARGS \
|
| + -t \
|
| + -l $language \
|
| + -c $config \
|
| + -x report.xml \
|
| + -j 2 \
|
| + $@ || TESTS_FAILED="true"
|
|
|
| +if [ ! -e reports/index.html ]
|
| +then
|
| + mkdir -p reports
|
| + echo 'No reports generated.' > reports/index.html
|
| +fi
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = request.ws_stream.receive_message()
|
| - if line is None:
|
| - return
|
| - if isinstance(line, unicode):
|
| - request.ws_stream.send_message(line, binary=False)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| - else:
|
| - request.ws_stream.send_message(line, binary=True)
|
| +if [ "$TESTS_FAILED" != "" ]
|
| +then
|
| + exit 1
|
| +fi
|
|
|