| Index: third_party/grpc/tools/jenkins/docker_run.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/tools/jenkins/docker_run.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 72%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/tools/jenkins/docker_run.sh
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..f04b1cfb55be69e017ec4b200fa9d6daf9b03207
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/tools/jenkins/docker_run.sh
|
| @@ -1,4 +1,5 @@
|
| -# Copyright 2010, Google Inc.
|
| +#!/bin/bash
|
| +# Copyright 2016, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -26,21 +27,28 @@
|
| # 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 build_docker_* inside a docker
|
| +# container. You should never need to call this script on your own.
|
|
|
| +set -ex
|
|
|
| -from mod_pywebsocket import msgutil
|
| -
|
| -
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +if [ "$RELATIVE_COPY_PATH" == "" ]
|
| +then
|
| + mkdir -p /var/local/git
|
| + git clone --recursive "$EXTERNAL_GIT_ROOT" /var/local/git/grpc
|
| +else
|
| + mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH"
|
| + cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH"
|
| +fi
|
|
|
| +$POST_GIT_STEP
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +if [ -x "$(command -v rvm)" ]
|
| +then
|
| + rvm use ruby-2.1
|
| +fi
|
|
|
| +cd /var/local/git/grpc
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +$RUN_COMMAND
|
|
|