| Index: third_party/grpc/tools/dockerfile/grpc_clang/Dockerfile
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/tools/dockerfile/grpc_clang/Dockerfile
|
| similarity index 61%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| copy to third_party/grpc/tools/dockerfile/grpc_clang/Dockerfile
|
| index 4206831cb5135d5e03928bf9d995b2bf9e156018..bb107cd6f8c118e7c480be8ff84f7d43716864a1 100644
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py
|
| +++ b/third_party/grpc/tools/dockerfile/grpc_clang/Dockerfile
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2012, Google Inc.
|
| +# Copyright 2015, Google Inc.
|
| # All rights reserved.
|
| #
|
| # Redistribution and use in source and binary forms, with or without
|
| @@ -27,22 +27,35 @@
|
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
| +FROM ubuntu:latest
|
|
|
| -_GOODBYE_MESSAGE = u'Goodbye'
|
| +RUN apt-get update && apt-get install -y \
|
| + cmake \
|
| + g++ \
|
| + gcc \
|
| + git \
|
| + make \
|
| + python \
|
| + && apt-get clean
|
|
|
| +RUN git clone -b release_36 http://llvm.org/git/llvm.git
|
| +RUN git clone -b release_36 http://llvm.org/git/clang.git
|
| +RUN git clone -b release_36 http://llvm.org/git/compiler-rt.git
|
| +RUN git clone -b release_36 http://llvm.org/git/clang-tools-extra.git
|
| +RUN git clone -b release_36 http://llvm.org/git/libcxx.git
|
| +RUN git clone -b release_36 http://llvm.org/git/libcxxabi.git
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - request.ws_extension_processors = []
|
| +RUN mv clang llvm/tools
|
| +RUN mv compiler-rt llvm/projects
|
| +RUN mv clang-tools-extra llvm/tools/clang/tools
|
| +RUN mv libcxx llvm/projects
|
| +RUN mv libcxxabi llvm/projects
|
|
|
| +RUN mkdir llvm-build
|
| +RUN cd llvm-build && cmake \
|
| + -DCMAKE_BUILD_TYPE:STRING=Release \
|
| + -DLLVM_TARGETS_TO_BUILD:STRING=X86 \
|
| + ../llvm
|
| +RUN make -C llvm-build && make -C llvm-build install && rm -rf llvm-build
|
|
|
| -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)
|
| +CMD ["bash"]
|
|
|