| Index: third_party/grpc/tools/jenkins/run_portability.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/tools/jenkins/run_portability.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 54%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/tools/jenkins/run_portability.sh
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..6f15da73f4306628e335f4f30bce18e3d0119e31
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/tools/jenkins/run_portability.sh
|
| @@ -1,4 +1,5 @@
|
| -# Copyright 2010, 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,21 +27,39 @@
|
| # 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 runs portability tests based on
|
| +# env variable setting.
|
| +#
|
| +# 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
|
|
|
| +echo "building $scenario"
|
|
|
| -from mod_pywebsocket import msgutil
|
| -
|
| +# If scenario has _bo suffix, add --build_only flag.
|
| +# Short suffix name had to been chosen due to path length limit on Windows.
|
| +if [ "$scenario" != "${scenario%_bo}" ]
|
| +then
|
| + scenario="${scenario%_bo}"
|
| + BUILD_ONLY_MAYBE="--build_only"
|
| +fi
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +parts=($(echo $scenario | tr '_' ' ')) # split scenario into parts
|
|
|
| +curr_platform=${parts[0]} # variable named 'platform' breaks the windows build
|
| +curr_arch=${parts[1]}
|
| +curr_compiler=${parts[2]}
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +config='dbg'
|
|
|
| +if [ "$curr_platform" == "linux" ]
|
| +then
|
| + USE_DOCKER_MAYBE="--use_docker"
|
| +fi
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +python tools/run_tests/run_tests.py $USE_DOCKER_MAYBE $BUILD_ONLY_MAYBE -t -l $language -c $config --arch ${curr_arch} --compiler ${curr_compiler} -x report.xml -j 3 $@
|
|
|