| Index: third_party/grpc/tools/run_tests/build_artifact_protoc.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/origin-test_wsh.py b/third_party/grpc/tools/run_tests/build_artifact_protoc.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 83%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/origin-test_wsh.py
|
| copy to third_party/grpc/tools/run_tests/build_artifact_protoc.sh
|
| index 2c97ac6e4eb321cc261346d02d264b522cdbd87c..161d3a84d6edd81e8aaea1aac055ca381d81f0b3
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/origin-test_wsh.py
|
| +++ b/third_party/grpc/tools/run_tests/build_artifact_protoc.sh
|
| @@ -1,4 +1,6 @@
|
| -# Copyright (C) 2009 Google Inc. All rights reserved.
|
| +#!/bin/bash
|
| +# Copyright 2016, Google Inc.
|
| +# All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| # modification, are permitted provided that the following conditions are
|
| @@ -26,13 +28,14 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +# Use devtoolset environment that has GCC 4.7 before set -ex
|
| +source scl_source enable devtoolset-1.1
|
|
|
| -from mod_pywebsocket import msgutil
|
| +set -ex
|
|
|
| +cd $(dirname $0)/../..
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| +make plugins
|
|
|
| -
|
| -def web_socket_transfer_data(request):
|
| - msgutil.send_message(request, request.ws_origin)
|
| +mkdir -p artifacts
|
| +cp bins/opt/protobuf/protoc bins/opt/*_plugin artifacts/
|
|
|