| Index: third_party/grpc/src/objective-c/tests/build_tests.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/src/objective-c/tests/build_tests.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/src/objective-c/tests/build_tests.sh
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..e7ad31e403159c03946258dca54749d3a642461f
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/src/objective-c/tests/build_tests.sh
|
| @@ -1,4 +1,5 @@
|
| -# Copyright 2010, Google Inc.
|
| +#!/bin/bash
|
| +# Copyright 2015, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,20 +28,39 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +# Don't run this script standalone. Instead, run from the repository root:
|
| +# ./tools/run_tests/run_tests.py -l objc
|
|
|
| -from mod_pywebsocket import msgutil
|
| +set -e
|
|
|
| +cd $(dirname $0)
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +hash pod 2>/dev/null || { echo >&2 "Cocoapods needs to be installed."; exit 1; }
|
| +hash xcodebuild 2>/dev/null || {
|
| + echo >&2 "XCode command-line tools need to be installed."
|
| + exit 1
|
| +}
|
|
|
| +BINDIR=../../../bins/$CONFIG
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +if [ ! -f $BINDIR/protobuf/protoc ]; then
|
| + hash protoc 2>/dev/null || {
|
| + echo >&2 "Can't find protoc. Make sure run_tests.py is making" \
|
| + "grpc_objective_c_plugin before calling this script."
|
| + exit 1
|
| + }
|
| + # When protoc is already installed, make doesn't compile one. Put a link
|
| + # there so the podspecs can do codegen using that path.
|
| + mkdir -p $BINDIR/protobuf
|
| + ln -s `which protoc` $BINDIR/protobuf/protoc
|
| +fi
|
|
|
| +[ -f $BINDIR/interop_server ] || {
|
| + echo >&2 "Can't find the test server. Make sure run_tests.py is making" \
|
| + "interop_server before calling this script. It needs to be done" \
|
| + "before because pod install of gRPC renames some C gRPC files" \
|
| + "and not the server's code references to them."
|
| + exit 1
|
| +}
|
|
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +pod install
|
|
|