Index: third_party/grpc/tools/jenkins/build_artifacts.sh |
diff --git a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py b/third_party/grpc/tools/jenkins/build_artifacts.sh |
old mode 100644 |
new mode 100755 |
similarity index 68% |
copy from third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py |
copy to third_party/grpc/tools/jenkins/build_artifacts.sh |
index 4206831cb5135d5e03928bf9d995b2bf9e156018..c0acbdfb276bbdaf2fa3ddb916fdc72793e59cae |
--- a/third_party/WebKit/LayoutTests/http/tests/websocket/echo-with-no-extension_wsh.py |
+++ b/third_party/grpc/tools/jenkins/build_artifacts.sh |
@@ -1,4 +1,5 @@ |
-# Copyright 2012, Google Inc. |
+#!/usr/bin/env bash |
+# Copyright 2016, Google Inc. |
# All rights reserved. |
# |
# Redistribution and use in source and binary forms, with or without |
@@ -26,23 +27,20 @@ |
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
+# |
+# This script is invoked by Jenkins and triggers build of artifacts. |
+# |
+# To prevent cygwin bash complaining about empty lines ending with \r |
+# we set the igncr option. The option doesn't exist on Linux, so we fallback |
+# to just 'set -ex' there. |
+# NOTE: No empty lines should appear in this file before igncr is set! |
+set -ex -o igncr || set -ex |
+curr_platform="$platform" |
+unset platform # variable named 'platform' breaks the windows build |
-_GOODBYE_MESSAGE = u'Goodbye' |
- |
- |
-def web_socket_do_extra_handshake(request): |
- request.ws_extension_processors = [] |
- |
- |
-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) |
+if [ "$curr_platform" == "linux" ] && [ "$language" == "ruby" ] ; then |
+ ./tools/run_tests/build_artifact_ruby.sh |
+else |
+ python tools/run_tests/task_runner.py -f artifact $language $curr_platform $architecture |
+fi |