| Index: third_party/grpc/tools/run_tests/prepare_travis.sh
|
| diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py b/third_party/grpc/tools/run_tests/prepare_travis.sh
|
| old mode 100644
|
| new mode 100755
|
| similarity index 60%
|
| copy from third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| copy to third_party/grpc/tools/run_tests/prepare_travis.sh
|
| index 429f58186e3fce43dc21e81e0f9d7e20c7e0bf70..10546535e8ea10387f5545a309a58424b027dd48
|
| --- a/third_party/WebKit/LayoutTests/http/tests/websocket/workers/resources/echo_wsh.py
|
| +++ b/third_party/grpc/tools/run_tests/prepare_travis.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,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.
|
|
|
| +cd `dirname $0`/../..
|
| +grpc_dir=`pwd`
|
|
|
| -from mod_pywebsocket import msgutil
|
| +distrib=`md5sum /etc/issue | cut -f1 -d\ `
|
| +echo "Configuring for distribution $distrib"
|
| +git submodule | while read sha path extra ; do
|
| + cd /tmp
|
| + name=`basename $path`
|
| + file=$name-$sha-$CONFIG-prebuilt-$distrib.tar.gz
|
| + echo -n "Looking for $file ..."
|
| + url=http://storage.googleapis.com/grpc-prebuilt-packages/$file
|
| + wget -q $url && (
|
| + echo " Found."
|
| + tar xfz $file
|
| + ) || echo " Not found."
|
| +done
|
|
|
| +mkdir -p bins/$CONFIG/protobuf
|
| +mkdir -p libs/$CONFIG/protobuf
|
| +mkdir -p libs/$CONFIG/openssl
|
|
|
| -_GOODBYE_MESSAGE = 'Goodbye'
|
| +function cpt {
|
| + cp /tmp/prebuilt/$1 $2/$CONFIG/$3
|
| + touch $2/$CONFIG/$3/`basename $1`
|
| +}
|
|
|
| +if [ -e /tmp/prebuilt/bin/protoc ] ; then
|
| + touch third_party/protobuf/configure
|
| + cpt bin/protoc bins protobuf
|
| + cpt lib/libprotoc.a libs protobuf
|
| + cpt lib/libprotobuf.a libs protobuf
|
| +fi
|
|
|
| -def web_socket_do_extra_handshake(request):
|
| - pass # Always accept.
|
| -
|
| -
|
| -def web_socket_transfer_data(request):
|
| - while True:
|
| - line = msgutil.receive_message(request)
|
| - msgutil.send_message(request, line)
|
| - if line == _GOODBYE_MESSAGE:
|
| - return
|
| +if [ -e /tmp/prebuilt/lib/libssl.a ] ; then
|
| + cpt lib/libcrypto.a libs openssl
|
| + cpt lib/libssl.a libs openssl
|
| +fi
|
|
|