| Index: third_party/grpc/tools/run_tests/build_artifact_python.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/tools/run_tests/build_artifact_python.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 55%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/tools/run_tests/build_artifact_python.sh
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..1f23f9fade880b11152dc5f0da526577fa040869
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/tools/run_tests/build_artifact_python.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
|
| @@ -27,20 +28,40 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +set -ex
|
|
|
| -from mod_pywebsocket import msgutil
|
| +cd $(dirname $0)/../..
|
|
|
| +if [ "$SKIP_PIP_INSTALL" == "" ]
|
| +then
|
| + pip install --upgrade six
|
| + # There's a bug in newer versions of setuptools (see
|
| + # https://bitbucket.org/pypa/setuptools/issues/503/pkg_resources_vendorpackagingrequirementsi)
|
| + pip install --upgrade 'setuptools==18'
|
| + pip install -rrequirements.txt
|
| +fi
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +export GRPC_PYTHON_USE_CUSTOM_BDIST=0
|
| +export GRPC_PYTHON_BUILD_WITH_CYTHON=1
|
|
|
| +# Build the source distribution first because MANIFEST.in cannot override
|
| +# exclusion of built shared objects among package resources (for some
|
| +# inexplicable reason).
|
| +${SETARCH_CMD} python setup.py \
|
| + sdist
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +# The bdist_wheel_grpc_custom command is finicky about command output ordering
|
| +# and thus ought to be run in a shell command separate of others. Further, it
|
| +# trashes the actual bdist_wheel output, so it should be run first so that
|
| +# bdist_wheel may be run unmolested.
|
| +${SETARCH_CMD} python setup.py \
|
| + build_tagged_ext
|
|
|
| +# Wheel has a bug where directories don't get excluded.
|
| +# https://bitbucket.org/pypa/wheel/issues/99/cannot-exclude-directory
|
| +${SETARCH_CMD} python setup.py \
|
| + bdist_wheel
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +mkdir -p artifacts
|
| +
|
| +cp -r dist/* artifacts
|
|
|