From 1d5aca5de05d16968f0f1e208a9aa10d7c06caac Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Sun, 14 Jun 2015 14:42:04 -0700 Subject: Added flags support to grpc_op. Which includes its propagation to grpc_ioreq and validation mechanisms for checking that only known bits are set ot in). Also added an internal flag (GRPC_WRITE_INTERNAL_COMPRESS) mask for its use in signaling compressed messages. --- tools/run_tests/tests.json | 139 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) (limited to 'tools') diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index f5c2e87a9c..d0d56ddb01 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -920,6 +920,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_fake_security_request_with_flags_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -1181,6 +1190,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_fullstack_request_with_flags_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -1419,6 +1437,14 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_fullstack_uds_posix_request_with_flags_test", + "platforms": [ + "posix" + ] + }, { "flaky": false, "language": "c", @@ -1651,6 +1677,14 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_fullstack_with_poll_request_with_flags_test", + "platforms": [ + "posix" + ] + }, { "flaky": false, "language": "c", @@ -1906,6 +1940,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_simple_ssl_fullstack_request_with_flags_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -2144,6 +2187,14 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_simple_ssl_fullstack_with_poll_request_with_flags_test", + "platforms": [ + "posix" + ] + }, { "flaky": false, "language": "c", @@ -2399,6 +2450,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_simple_ssl_with_oauth2_fullstack_request_with_flags_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -2660,6 +2720,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_socket_pair_request_with_flags_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -2921,6 +2990,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_flags_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -3182,6 +3260,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_socket_pair_with_grpc_trace_request_with_flags_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -3434,6 +3521,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_fullstack_request_with_flags_unsecure_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -3664,6 +3760,14 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_fullstack_uds_posix_request_with_flags_unsecure_test", + "platforms": [ + "posix" + ] + }, { "flaky": false, "language": "c", @@ -3888,6 +3992,14 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_fullstack_with_poll_request_with_flags_unsecure_test", + "platforms": [ + "posix" + ] + }, { "flaky": false, "language": "c", @@ -4134,6 +4246,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_socket_pair_request_with_flags_unsecure_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -4386,6 +4507,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_socket_pair_one_byte_at_a_time_request_with_flags_unsecure_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", @@ -4638,6 +4768,15 @@ "posix" ] }, + { + "flaky": false, + "language": "c", + "name": "chttp2_socket_pair_with_grpc_trace_request_with_flags_unsecure_test", + "platforms": [ + "windows", + "posix" + ] + }, { "flaky": false, "language": "c", -- cgit v1.2.3 From 932fbd7d2d3aa93e55265829a259de7a5b8dfc16 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Mon, 15 Jun 2015 13:55:52 -0700 Subject: Add PHP to jenkins --- tools/jenkins/grpc_jenkins_slave/Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tools') diff --git a/tools/jenkins/grpc_jenkins_slave/Dockerfile b/tools/jenkins/grpc_jenkins_slave/Dockerfile index c3722457db..c48bc0220f 100644 --- a/tools/jenkins/grpc_jenkins_slave/Dockerfile +++ b/tools/jenkins/grpc_jenkins_slave/Dockerfile @@ -115,5 +115,19 @@ RUN apt-get update && apt-get install -y \ # Install Python packages from PyPI RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.0.0a2 +################## +# PHP dependencies + +# Install dependencies + +RUN /bin/bash -l -c "echo 'deb http://packages.dotdeb.org wheezy-php55 all' \ + >> /etc/apt/sources.list.d/dotdeb.list" +RUN /bin/bash -l -c "echo 'deb-src http://packages.dotdeb.org wheezy-php55 all' \ + >> /etc/apt/sources.list.d/dotdeb.list" +RUN wget http://www.dotdeb.org/dotdeb.gpg -O- | apt-key add - + +RUN apt-get update && apt-get install -y \ + git php5 php5-dev phpunit unzip + # Define the default command. CMD ["bash"] -- cgit v1.2.3 From 4b3f9522ec0c9564d474178f62dedb96c1ace20b Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 15 Jun 2015 16:41:48 -0700 Subject: make buildtests on windows pass --- build.json | 3 +++ test/core/end2end/gen_build_json.py | 2 +- tools/run_tests/tests.json | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/build.json b/build.json index aeb36fd7f3..0c64ff50b3 100644 --- a/build.json +++ b/build.json @@ -1361,6 +1361,9 @@ "grpc", "gpr_test_util", "gpr" + ], + "platforms": [ + "posix" ] }, { diff --git a/test/core/end2end/gen_build_json.py b/test/core/end2end/gen_build_json.py index fb13c7840c..f9a41a8fe0 100755 --- a/test/core/end2end/gen_build_json.py +++ b/test/core/end2end/gen_build_json.py @@ -101,7 +101,7 @@ def main(): 'language': 'c', 'secure': 'check' if END2END_FIXTURES[f].secure else 'no', 'src': ['test/core/end2end/fixtures/%s.c' % f], - 'platforms': [ 'posix' ] if f.endswith('_posix') else [ 'windows', 'posix' ], + 'platforms': [ 'posix' ] if f.endswith('_posix') else END2END_FIXTURES[f].platforms, } for f in sorted(END2END_FIXTURES.keys())] + [ { diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json index f5c2e87a9c..dfe099aa59 100644 --- a/tools/run_tests/tests.json +++ b/tools/run_tests/tests.json @@ -353,7 +353,6 @@ "language": "c", "name": "httpcli_test", "platforms": [ - "windows", "posix" ] }, -- cgit v1.2.3 From 12e8a049e4d7b7f52baaf72604a093fdc3612120 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 15 Jun 2015 17:07:14 -0700 Subject: backslashes break build on jenkins --- tools/run_tests/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index ea40d7e990..2c9ffe72ec 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -123,7 +123,7 @@ class CLanguage(object): if travis and target['flaky']: continue if self.platform == 'windows': - binary = 'vsprojects\\test_bin\\%s.exe' % (target['name']) + binary = 'vsprojects/test_bin/%s.exe' % (target['name']) else: binary = 'bins/%s/%s' % (config.build_config, target['name']) out.append(config.job_spec([binary], [binary])) -- cgit v1.2.3 From 04b28e7933dcf3edf91f512e7608bf11144d4dc8 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 15 Jun 2015 22:06:41 -0700 Subject: Make run_jenkins.sh actually fail on failure --- tools/jenkins/run_jenkins.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'tools') diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index 57cec77424..5e8ddb92fc 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -68,6 +68,7 @@ then else echo "Docker exited with failure, keeping container $DOCKER_CID." echo "You can SSH to the worker and use 'docker start CID' and 'docker exec -i -t CID bash' to debug the problem." + exit 1 fi elif [ "$platform" == "windows" ] -- cgit v1.2.3 From 9d3fbcf0ba248d981d26a6a3b9add6f85a5e2595 Mon Sep 17 00:00:00 2001 From: Masood Malekghassemi Date: Tue, 16 Jun 2015 13:15:47 -0700 Subject: Make warnings errors when building Python tests --- src/python/src/grpc/_adapter/_c/utility.c | 9 +++++---- tools/run_tests/build_python.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/src/python/src/grpc/_adapter/_c/utility.c b/src/python/src/grpc/_adapter/_c/utility.c index 64b3428f2b..97f2f35b8e 100644 --- a/src/python/src/grpc/_adapter/_c/utility.c +++ b/src/python/src/grpc/_adapter/_c/utility.c @@ -196,10 +196,11 @@ int pygrpc_produce_op(PyObject *op, grpc_op *result) { return 0; } if (!PyTuple_Check(PyTuple_GET_ITEM(op, STATUS_INDEX))) { - char buf[64]; - snprintf(buf, sizeof(buf), "expected tuple status in op of length %d", - STATUS_TUPLE_SIZE); - PyErr_SetString(PyExc_TypeError, buf); + char *buf; + gpr_asprintf(&buf, "expected tuple status in op of length %d", + STATUS_TUPLE_SIZE); + PyErr_SetString(PyExc_ValueError, buf); + gpr_free(buf); return 0; } c_op.data.send_status_from_server.status = PyInt_AsLong( diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh index 53db6af0ea..d9b7644f44 100755 --- a/tools/run_tests/build_python.sh +++ b/tools/run_tests/build_python.sh @@ -38,5 +38,5 @@ rm -rf python2.7_virtual_environment virtualenv -p /usr/bin/python2.7 python2.7_virtual_environment source python2.7_virtual_environment/bin/activate pip install -r src/python/requirements.txt -CFLAGS="-I$root/include -std=c89" LDFLAGS=-L$root/libs/$CONFIG pip install src/python/src +CFLAGS="-I$root/include -std=c89 -Werror" LDFLAGS=-L$root/libs/$CONFIG pip install src/python/src pip install src/python/interop -- cgit v1.2.3