From 7a4e8e4498f257e5327fc8fdc7f94145ae4075ef Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Tue, 22 Sep 2015 16:10:27 -0700 Subject: php: fix jenkins flake --- tools/run_tests/build_php.sh | 3 --- 1 file changed, 3 deletions(-) (limited to 'tools/run_tests') 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 -- cgit v1.2.3 From 8a7b7468c0f0060b13ea0eb6379326db18772347 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 23 Sep 2015 01:24:10 +0200 Subject: Fixing sanity. --- tools/run_tests/run_sanity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/run_tests') 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 -- cgit v1.2.3 From ae4fbcd6434de1b927259f5456a822f720e36434 Mon Sep 17 00:00:00 2001 From: Nathaniel Manista Date: Wed, 23 Sep 2015 16:29:44 +0000 Subject: Use "#!/usr/bin/env python2.7" only in utilities --- test/core/bad_client/gen_build_yaml.py | 2 +- test/core/end2end/gen_build_yaml.py | 2 +- test/core/httpcli/test_server.py | 2 +- tools/buildgen/build-cleaner.py | 2 +- tools/buildgen/mako_renderer.py | 2 +- tools/distrib/check_copyright.py | 2 +- tools/distrib/python/docgen.py | 2 +- tools/distrib/python/submit.py | 2 +- tools/profile_analyzer/profile_analyzer.py | 2 +- tools/run_tests/antagonist.py | 2 +- tools/run_tests/port_server.py | 2 +- tools/run_tests/run_tests.py | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tools/run_tests') diff --git a/test/core/bad_client/gen_build_yaml.py b/test/core/bad_client/gen_build_yaml.py index 02dda10be0..3df889ecda 100755 --- a/test/core/bad_client/gen_build_yaml.py +++ b/test/core/bad_client/gen_build_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # Copyright 2015, Google Inc. # All rights reserved. # diff --git a/test/core/end2end/gen_build_yaml.py b/test/core/end2end/gen_build_yaml.py index 46cdb80c86..9988950a6e 100755 --- a/test/core/end2end/gen_build_yaml.py +++ b/test/core/end2end/gen_build_yaml.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 # Copyright 2015, Google Inc. # All rights reserved. # diff --git a/test/core/httpcli/test_server.py b/test/core/httpcli/test_server.py index babfe84ddc..4aaf5e30f8 100755 --- a/test/core/httpcli/test_server.py +++ b/test/core/httpcli/test_server.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.7 """Server for httpcli_test""" diff --git a/tools/buildgen/build-cleaner.py b/tools/buildgen/build-cleaner.py index 939143c4cb..6c9c6b3749 100755 --- a/tools/buildgen/build-cleaner.py +++ b/tools/buildgen/build-cleaner.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/buildgen/mako_renderer.py b/tools/buildgen/mako_renderer.py index abb8df2141..f1b28d352e 100755 --- a/tools/buildgen/mako_renderer.py +++ b/tools/buildgen/mako_renderer.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/distrib/check_copyright.py b/tools/distrib/check_copyright.py index 1d09ed42a5..fac2a5af09 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!/usr/bin/env python2.7 # Copyright 2015, Google Inc. # All rights reserved. diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py index 2acd3cc12f..4ac8f9c64a 100755 --- a/tools/distrib/python/docgen.py +++ b/tools/distrib/python/docgen.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/distrib/python/submit.py b/tools/distrib/python/submit.py index 909ba56327..dffbefd5fe 100755 --- a/tools/distrib/python/submit.py +++ b/tools/distrib/python/submit.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/profile_analyzer/profile_analyzer.py b/tools/profile_analyzer/profile_analyzer.py index a78f84e5e6..e5e9a28a92 100755 --- a/tools/profile_analyzer/profile_analyzer.py +++ b/tools/profile_analyzer/profile_analyzer.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/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/port_server.py b/tools/run_tests/port_server.py index acb6deaae6..da76230ad5 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_tests.py b/tools/run_tests/run_tests.py index f7e9805393..b384858d6c 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. # -- cgit v1.2.3 From 7bedba8c45e996aaa1718b02457a644219ff7ea0 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 24 Sep 2015 08:22:43 -0700 Subject: Disable zookeeper test for now --- Makefile | 2 -- build.yaml | 1 + tools/run_tests/tests.json | 12 ------------ 3 files changed, 1 insertion(+), 14 deletions(-) (limited to 'tools/run_tests') diff --git a/Makefile b/Makefile index d44f81c860..c3ee441400 100644 --- a/Makefile +++ b/Makefile @@ -3374,8 +3374,6 @@ flaky_test_cxx: buildtests_cxx ifeq ($(HAS_ZOOKEEPER),true) test_zookeeper: buildtests_zookeeper - $(E) "[RUN] Testing zookeeper_test" - $(Q) $(BINDIR)/$(CONFIG)/zookeeper_test || ( echo test zookeeper_test failed ; exit 1 ) flaky_test_zookeeper: buildtests_zookeeper diff --git a/build.yaml b/build.yaml index 527b7d5944..7ab70485c5 100644 --- a/build.yaml +++ b/build.yaml @@ -1003,6 +1003,7 @@ targets: deps: [grpc++_test_util, grpc_test_util, grpc++, grpc, gpr_test_util, gpr] - name: zookeeper_test build: test + run: false language: c++ src: [test/cpp/end2end/zookeeper_test.cc] deps: [grpc++_test_util, grpc_test_util, grpc++, grpc_zookeeper, grpc, gpr_test_util, diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index df251a2b8e..ebdd52f0af 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -1647,18 +1647,6 @@ "windows" ] }, - { - "ci_platforms": [ - "linux" - ], - "exclude_configs": [], - "flaky": false, - "language": "c++", - "name": "zookeeper_test", - "platforms": [ - "linux" - ] - }, { "ci_platforms": [ "linux", -- cgit v1.2.3 From c1385d6705bbf2ea57d6d322d2d62bda85685d7f Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 24 Sep 2015 08:52:00 -0700 Subject: Fix (hackily) fling_stream_test under gyp --- .gitignore | 4 ++++ tools/run_tests/run_tests.py | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'tools/run_tests') diff --git a/.gitignore b/.gitignore index 45f8fdaa46..8dc459ea27 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,7 @@ report.xml # port server log portlog.txt + +# gyp generated make files +*-gyp.mk +out \ No newline at end of file diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index a1d0376a4f..e971aaf9c3 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -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 [] -- cgit v1.2.3 From a2f38b0563beba703922c7aaa0a61a975d8b830e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Thu, 24 Sep 2015 11:19:17 -0700 Subject: Dump portlog.txt on port server error, detect crashes earlier --- tools/run_tests/run_tests.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'tools/run_tests') diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index e971aaf9c3..d271137ca1 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -727,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, -- cgit v1.2.3