Merge github.com:grpc/grpc into shindig

6 files changed, 10 insertions, 20 deletions

diff --git a/tools/run_tests/antagonist.py b/tools/run_tests/antagonist.py
index 111839ccf9..857addfb38 100755
--- a/tools/run_tests/antagonist.py
+++ b/tools/run_tests/antagonist.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/run_tests/build_php.sh b/tools/run_tests/build_php.sh
index 2fad09e1c4..1d81779b6a 100755
--- a/tools/run_tests/build_php.sh
+++ b/tools/run_tests/build_php.sh
@@ -46,6 +46,3 @@ cd ext/grpc
 phpize
 ./configure --enable-grpc=$root
 make
-
-# in some jenkins macos machine, somehow the PHP build script can't find libgrpc.dylib
-export DYLD_LIBRARY_PATH=$(pwd)/libs/$config
diff --git a/tools/run_tests/port_server.py b/tools/run_tests/port_server.py
index aab9e4723b..48b6214b95 100755
--- a/tools/run_tests/port_server.py
+++ b/tools/run_tests/port_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
diff --git a/tools/run_tests/run_sanity.sh b/tools/run_tests/run_sanity.sh
index c18160a891..4b367dcbc7 100755
--- a/tools/run_tests/run_sanity.sh
+++ b/tools/run_tests/run_sanity.sh
@@ -44,7 +44,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules
  05b155ff59114735ec8cd089f669c4c3d8f59029 third_party/gflags (v2.1.0-45-g05b155f)
  c99458533a9b4c743ed51537e25989ea55944908 third_party/googletest (release-1.7.0)
  33dd08320648ac71d7d9d732be774ed3818dccc5 third_party/openssl (OpenSSL_1_0_2d)
- 23408684b4d2bf1b25e14314413a14d542c18bc4 third_party/protobuf (v3.0.0-alpha-1-1592-g2340868)
+ 8fce8933649ce09c1661ff2b5b7f6eb79badd251 third_party/protobuf (v3.0.0-alpha-4-1-g8fce893)
  50893291621658f355bc5b4d450a8d06a563053d third_party/zlib (v1.2.8)
 EOF
 
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 13d60e6f7b..d271137ca1 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 # Copyright 2015, Google Inc.
 # All rights reserved.
 #
@@ -199,7 +199,9 @@ class GYPCLanguage(object):
     return [['gyp', '--depth=.', '--suffix=-gyp', 'grpc.gyp']]
 
   def make_targets(self):
-    return gyp_test_paths(False)
+    # HACK(ctiller): force fling_client and fling_server to be built, as fling_test
+    # needs these
+    return gyp_test_paths(False) + ['fling_client', 'fling_server']
 
   def build_steps(self):
     return []
@@ -725,7 +727,10 @@ def _start_port_server(port_server_port):
     while True:
       if waits > 10:
         port_server.kill()
+      if port_server.poll() is not None:
         print "port_server failed to start"
+        port_log = open('portlog.txt', 'r').read()
+        print port_log
         sys.exit(1)
       try:
         urllib2.urlopen('http://localhost:%d/get' % port_server_port,
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 5f4d4d4ebd..7989f5c100 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -1651,18 +1651,6 @@
   }, 
   {
     "ci_platforms": [
-      "linux"
-    ], 
-    "exclude_configs": [], 
-    "flaky": false, 
-    "language": "c++", 
-    "name": "zookeeper_test", 
-    "platforms": [
-      "linux"
-    ]
-  }, 
-  {
-    "ci_platforms": [
       "linux", 
       "mac", 
       "posix",