| Index: third_party/grpc/src/objective-c/tests/run_tests.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/src/objective-c/tests/run_tests.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 64%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| copy to third_party/grpc/src/objective-c/tests/run_tests.sh
|
| index 4206831cb5135d5e03928bf9d995b2bf9e156018..c4fc5644f284c4b64d376e765a76821a495ec805
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| +++ b/third_party/grpc/src/objective-c/tests/run_tests.sh
|
| @@ -1,4 +1,5 @@
|
| -# Copyright 2012, Google Inc.
|
| +#!/bin/bash
|
| +# Copyright 2015, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,22 +28,28 @@
|
| # (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
|
|
|
| -_GOODBYE_MESSAGE = u'Goodbye'
|
| +set -e
|
|
|
| +cd $(dirname $0)
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - request.ws_extension_processors = []
|
| +# Run the tests server.
|
| +../../../bins/$CONFIG/interop_server --port=5050 &
|
| +../../../bins/$CONFIG/interop_server --port=5051 --use_tls &
|
| +# Kill them when this script exits.
|
| +trap 'kill -9 `jobs -p`' EXIT
|
|
|
| -
|
| -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)
|
| +# xcodebuild is very verbose. We filter its output and tell Bash to fail if any
|
| +# element of the pipe fails.
|
| +# TODO(jcanizales): Use xctool instead? Issue #2540.
|
| +set -o pipefail
|
| +XCODEBUILD_FILTER='(^===|^\*\*|\bfatal\b|\berror\b|\bwarning\b|\bfail)'
|
| +xcodebuild \
|
| + -workspace Tests.xcworkspace \
|
| + -scheme AllTests \
|
| + -destination name="iPhone 6" \
|
| + test \
|
| + | egrep "$XCODEBUILD_FILTER" \
|
| + | egrep -v "(GPBDictionary|GPBArray)" -
|
|
|