diff options
author | 2017-10-18 13:40:55 -0700 | |
---|---|---|
committer | 2017-10-18 13:40:55 -0700 | |
commit | 40ad5ea96c99425c018fe2885dab3fcb6a21f56f (patch) | |
tree | c39fa37d855d22cf5dbac378c1b7fc7c896b78e8 /tools | |
parent | be717835077059535c93ba89af45983b9c2997a4 (diff) | |
parent | 0d1150855d5c812d649111a4675ad0c444dafdc4 (diff) |
Merge github.com:grpc/grpc into tfix2
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh | 13 | ||||
-rw-r--r-- | tools/doxygen/Doxyfile.c++.internal | 1 | ||||
-rw-r--r-- | tools/doxygen/Doxyfile.core.internal | 1 | ||||
-rwxr-xr-x | tools/internal_ci/helper_scripts/gen_report_index.sh | 2 | ||||
-rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_interop_rc | 1 | ||||
-rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc | 1 | ||||
-rwxr-xr-x | tools/interop_matrix/create_matrix_images.py | 2 | ||||
-rwxr-xr-x | tools/run_tests/dockerize/build_interop_image.sh | 8 | ||||
-rw-r--r-- | tools/run_tests/generated/sources_and_headers.json | 57 | ||||
-rw-r--r-- | tools/run_tests/generated/tests.json | 79 | ||||
-rw-r--r-- | tools/run_tests/python_utils/filter_pull_request_tests.py | 2 | ||||
-rwxr-xr-x | tools/run_tests/run_interop_tests.py | 12 | ||||
-rwxr-xr-x | tools/run_tests/run_tests.py | 6 | ||||
-rwxr-xr-x | tools/run_tests/sanity/check_sources_and_headers.py | 1 | ||||
-rwxr-xr-x | tools/run_tests/sanity/check_submodules.sh | 1 | ||||
-rwxr-xr-x | tools/run_tests/sanity/check_test_filtering.py | 3 |
16 files changed, 128 insertions, 62 deletions
diff --git a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh index 93aab402aa..c16efc1d35 100755 --- a/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_node/build_interop.sh @@ -17,17 +17,18 @@ set -e mkdir -p /var/local/git -git clone /var/local/jenkins/grpc /var/local/git/grpc +git clone /var/local/jenkins/grpc-node /var/local/git/grpc-node # clone gRPC submodules, use data from locally cloned submodules where possible -(cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \ -&& git submodule update --init --reference /var/local/jenkins/grpc/${name} \ +(cd /var/local/jenkins/grpc-node/ && git submodule foreach 'cd /var/local/git/grpc-node \ +&& git submodule update --init --recursive --reference /var/local/jenkins/grpc-node/${name} \ ${name}') # copy service account keys if available cp -r /var/local/jenkins/service_account $HOME || true -cd /var/local/git/grpc +cd /var/local/git/grpc-node # build Node interop client & server -npm install -g node-gyp -npm install --unsafe-perm --build-from-source +npm install -g node-gyp gulp +npm install +gulp setup diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index bcf91e7b05..c9c64399f7 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -1041,6 +1041,7 @@ src/core/lib/support/string.h \ src/core/lib/support/string_windows.h \ src/core/lib/support/time_precise.h \ src/core/lib/support/tmpfile.h \ +src/core/lib/support/vector.h \ src/core/lib/surface/alarm_internal.h \ src/core/lib/surface/api_trace.h \ src/core/lib/surface/call.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index 8435178d2e..1b1a7e7a70 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -1354,6 +1354,7 @@ src/core/lib/support/tmpfile.h \ src/core/lib/support/tmpfile_msys.cc \ src/core/lib/support/tmpfile_posix.cc \ src/core/lib/support/tmpfile_windows.cc \ +src/core/lib/support/vector.h \ src/core/lib/support/wrap_memcpy.cc \ src/core/lib/surface/README.md \ src/core/lib/surface/alarm.cc \ diff --git a/tools/internal_ci/helper_scripts/gen_report_index.sh b/tools/internal_ci/helper_scripts/gen_report_index.sh index 0af89c331c..576ff67d54 100755 --- a/tools/internal_ci/helper_scripts/gen_report_index.sh +++ b/tools/internal_ci/helper_scripts/gen_report_index.sh @@ -26,7 +26,7 @@ mkdir -p reports echo '<html><head></head><body>' > reports/kokoro_index.html echo '<h1>'${KOKORO_JOB_NAME}', build '#${KOKORO_BUILD_NUMBER}'</h1>' >> reports/kokoro_index.html -echo '<h2><a href="https://kokoro.corp.google.com/job/'${KOKORO_JOB_PATH}'/'${KOKORO_BUILD_NUMBER}'/">Kokoro build dashboard (internal only)</a></h2>' >> reports/kokoro_index.html +echo '<h2><a href="https://kokoro2.corp.google.com/job/'${KOKORO_JOB_PATH}'/'${KOKORO_BUILD_NUMBER}'/">Kokoro build dashboard (internal only)</a></h2>' >> reports/kokoro_index.html echo '<h2><a href="https://sponge.corp.google.com/invocation?id='${KOKORO_BUILD_ID}'&searchFor=">Test result dashboard (internal only)</a></h2>' >> reports/kokoro_index.html echo '<h2><a href="test_report.html">HTML test report (Not available yet)</a></h2>' >> reports/kokoro_index.html echo '<h2><a href="test_log.txt">Test log (Not available yet)</a></h2>' >> reports/kokoro_index.html diff --git a/tools/internal_ci/helper_scripts/prepare_build_interop_rc b/tools/internal_ci/helper_scripts/prepare_build_interop_rc index 859ce621f9..db978c8b3f 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_interop_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_interop_rc @@ -26,6 +26,7 @@ git submodule update --init # Set up gRPC-Go and gRPC-Java to test git clone --recursive https://github.com/grpc/grpc-go ./../grpc-go git clone --recursive https://github.com/grpc/grpc-java ./../grpc-java +git clone --recursive https://github.com/grpc/grpc-node ./../grpc-node # Download json file. mkdir ~/service_account diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc index f467ac006a..bb046defb1 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_interop_rc @@ -30,6 +30,7 @@ brew install md5sha1sum # Set up gRPC-Go and gRPC-Java to test git clone --recursive https://github.com/grpc/grpc-go ./../grpc-go git clone --recursive https://github.com/grpc/grpc-java ./../grpc-java +git clone --recursive https://github.com/grpc/grpc-node ./../grpc-node # Set up Docker for Mac docker-machine create -d virtualbox --virtualbox-share-folder "/Users/kbuilder/workspace:" default diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py index 119cbd2e88..67355e7fbf 100755 --- a/tools/interop_matrix/create_matrix_images.py +++ b/tools/interop_matrix/create_matrix_images.py @@ -174,7 +174,7 @@ def build_all_images_for_release(lang, release): # If we not using current tree or the sibling for grpc stack, do checkout. if args.git_checkout: stack_base = checkout_grpc_stack(lang, release) - var ={'go': 'GRPC_GO_ROOT', 'java': 'GRPC_JAVA_ROOT'}.get(lang, 'GRPC_ROOT') + var ={'go': 'GRPC_GO_ROOT', 'java': 'GRPC_JAVA_ROOT', 'node': 'GRPC_NODE_ROOT'}.get(lang, 'GRPC_ROOT') env[var] = stack_base for runtime in client_matrix.LANG_RUNTIME_MATRIX[lang]: diff --git a/tools/run_tests/dockerize/build_interop_image.sh b/tools/run_tests/dockerize/build_interop_image.sh index 9d8ad5325c..09e062980d 100755 --- a/tools/run_tests/dockerize/build_interop_image.sh +++ b/tools/run_tests/dockerize/build_interop_image.sh @@ -48,6 +48,14 @@ else echo "WARNING: grpc-go not found, it won't be mounted to the docker container." fi +echo "GRPC_NODE_ROOT: ${GRPC_NODE_ROOT:=$(cd ../grpc-node && pwd)}" +if [ -n "$GRPC_NODE_ROOT" ] +then + MOUNT_ARGS+=" -v $GRPC_NODE_ROOT:/var/local/jenkins/grpc-node:ro" +else + echo "WARNING: grpc-node not found, it won't be mounted to the docker container." +fi + mkdir -p /tmp/ccache # Mount service account dir if available. diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 2e18ed2e8a..e47b27ebe1 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -2447,23 +2447,6 @@ "headers": [], "is_filegroup": false, "language": "c", - "name": "transport_pid_controller_test", - "src": [ - "test/core/transport/pid_controller_test.c" - ], - "third_party": false, - "type": "target" - }, - { - "deps": [ - "gpr", - "gpr_test_util", - "grpc", - "grpc_test_util" - ], - "headers": [], - "is_filegroup": false, - "language": "c", "name": "transport_security_test", "src": [ "test/core/tsi/transport_security_test.c" @@ -4254,6 +4237,44 @@ "headers": [], "is_filegroup": false, "language": "c++", + "name": "transport_pid_controller_test", + "src": [ + "test/core/transport/pid_controller_test.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc++", + "grpc++_test", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "vector_test", + "src": [ + "test/core/support/vector_test.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util", + "grpc", + "grpc++", + "grpc++_test_util", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", "name": "writes_per_rpc_test", "src": [ "test/cpp/performance/writes_per_rpc_test.cc" @@ -8249,6 +8270,7 @@ "src/core/lib/slice/slice_hash_table.h", "src/core/lib/slice/slice_internal.h", "src/core/lib/slice/slice_string_helpers.h", + "src/core/lib/support/vector.h", "src/core/lib/surface/alarm_internal.h", "src/core/lib/surface/api_trace.h", "src/core/lib/surface/call.h", @@ -8384,6 +8406,7 @@ "src/core/lib/slice/slice_hash_table.h", "src/core/lib/slice/slice_internal.h", "src/core/lib/slice/slice_string_helpers.h", + "src/core/lib/support/vector.h", "src/core/lib/surface/alarm_internal.h", "src/core/lib/surface/api_trace.h", "src/core/lib/surface/call.h", diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index d690433d5e..2b21215108 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -2867,31 +2867,7 @@ "posix", "windows" ], - "uses_polling": false - }, - { - "args": [], - "benchmark": false, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "exclude_configs": [], - "exclude_iomgrs": [], - "flaky": false, - "gtest": false, - "language": "c", - "name": "transport_pid_controller_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "uses_polling": false + "uses_polling": true }, { "args": [], @@ -4361,7 +4337,9 @@ "windows" ], "cpu_cost": 1.0, - "exclude_configs": [], + "exclude_configs": [ + "tsan" + ], "exclude_iomgrs": [], "flaky": false, "gtest": true, @@ -4373,6 +4351,7 @@ "posix", "windows" ], + "timeout_seconds": 1200, "uses_polling": false }, { @@ -4476,6 +4455,54 @@ "ci_platforms": [ "linux", "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": false, + "language": "c++", + "name": "transport_pid_controller_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", + "name": "vector_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", "posix" ], "cpu_cost": 0.5, diff --git a/tools/run_tests/python_utils/filter_pull_request_tests.py b/tools/run_tests/python_utils/filter_pull_request_tests.py index 393aef8662..56d6e4e988 100644 --- a/tools/run_tests/python_utils/filter_pull_request_tests.py +++ b/tools/run_tests/python_utils/filter_pull_request_tests.py @@ -78,7 +78,7 @@ _WHITELIST_DICT = { '^src/python/': [_PYTHON_TEST_SUITE], '^src/ruby/': [_RUBY_TEST_SUITE], '^templates/': [], - '^test/core/': [_CORE_TEST_SUITE], + '^test/core/': [_CORE_TEST_SUITE, _CPP_TEST_SUITE], '^test/cpp/': [_CPP_TEST_SUITE], '^test/distrib/cpp/': [_CPP_TEST_SUITE], '^test/distrib/csharp/': [_CSHARP_TEST_SUITE], diff --git a/tools/run_tests/run_interop_tests.py b/tools/run_tests/run_interop_tests.py index 2f826871a0..b20d6ce88e 100755 --- a/tools/run_tests/run_interop_tests.py +++ b/tools/run_tests/run_interop_tests.py @@ -313,20 +313,20 @@ class Http2Client: class NodeLanguage: def __init__(self): - self.client_cwd = None - self.server_cwd = None + self.client_cwd = '../grpc-node' + self.server_cwd = '../grpc-node' self.safename = str(self) def client_cmd(self, args): - return ['tools/run_tests/interop/with_nvm.sh', - 'node', 'src/node/interop/interop_client.js'] + args + return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', + 'node', 'test/interop/interop_client.js'] + args def cloud_to_prod_env(self): return {} def server_cmd(self, args): - return ['tools/run_tests/interop/with_nvm.sh', - 'node', 'src/node/interop/interop_server.js'] + args + return ['packages/grpc-native-core/deps/grpc/tools/run_tests/interop/with_nvm.sh', + 'node', 'test/interop/interop_server.js'] + args def global_env(self): return {} diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 588784353a..9999878a32 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -340,12 +340,12 @@ class CLanguage(object): with open(os.devnull, 'w') as fnull: tests = subprocess.check_output([binary, '--benchmark_list_tests'], stderr=fnull) - base = None for line in tests.split('\n'): test = line.strip() + if not test: continue cmdline = [binary, '--benchmark_filter=%s$' % test] + target['args'] out.append(self.config.job_spec(cmdline, - shortname='%s:%s %s' % (binary, test, shortname_ext), + shortname='%s %s' % (' '.join(cmdline), shortname_ext), cpu_cost=cpu_cost, timeout_seconds=_DEFAULT_TIMEOUT_SECONDS * timeout_scaling, environ=env)) @@ -371,7 +371,7 @@ class CLanguage(object): out.append(self.config.job_spec(cmdline, shortname='%s %s' % (' '.join(cmdline), shortname_ext), cpu_cost=cpu_cost, - timeout_seconds=_DEFAULT_TIMEOUT_SECONDS * timeout_scaling, + timeout_seconds=target.get('timeout_seconds', _DEFAULT_TIMEOUT_SECONDS) * timeout_scaling, environ=env)) else: cmdline = [binary] + target['args'] diff --git a/tools/run_tests/sanity/check_sources_and_headers.py b/tools/run_tests/sanity/check_sources_and_headers.py index c27a0b79e9..cae175cfc3 100755 --- a/tools/run_tests/sanity/check_sources_and_headers.py +++ b/tools/run_tests/sanity/check_sources_and_headers.py @@ -36,6 +36,7 @@ def get_target(name): assert False, 'no target %s' % name def target_has_header(target, name): + if name.startswith('absl/'): return True # print target['name'], name if name in target['headers']: return True diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index 97324f0a3a..2aee0001a3 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -35,6 +35,7 @@ cat << EOF | awk '{ print $1 }' | sort > $want_submodules cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11) 3be1924221e1326df520f8498d704a5c4c8d0cce third_party/cares/cares (cares-1_13_0) 73594cde8c9a52a102c4341c244c833aa61b9c06 third_party/bloaty + cc4bed2d74f7c8717e31f9579214ab52a9c9c610 third_party/abseil-cpp EOF diff -u $submodules $want_submodules diff --git a/tools/run_tests/sanity/check_test_filtering.py b/tools/run_tests/sanity/check_test_filtering.py index 3ebb9389f7..a523f087a1 100755 --- a/tools/run_tests/sanity/check_test_filtering.py +++ b/tools/run_tests/sanity/check_test_filtering.py @@ -81,7 +81,8 @@ class TestFilteringTest(unittest.TestCase): self.test_filtering(['src/core/foo.bar'], [_LIST_OF_LANGUAGE_LABELS]) # Testing individual languages self.test_filtering(['test/core/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._CORE_TEST_SUITE.labels]) + filter_pull_request_tests._CORE_TEST_SUITE.labels + + filter_pull_request_tests._CPP_TEST_SUITE.labels]) self.test_filtering(['src/cpp/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in filter_pull_request_tests._CPP_TEST_SUITE.labels]) self.test_filtering(['src/csharp/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in |