diff options
Diffstat (limited to 'tools')
46 files changed, 612 insertions, 1475 deletions
diff --git a/tools/buildgen/plugins/expand_version.py b/tools/buildgen/plugins/expand_version.py index d602e3421b..d8a3600b7c 100755 --- a/tools/buildgen/plugins/expand_version.py +++ b/tools/buildgen/plugins/expand_version.py @@ -23,14 +23,13 @@ a custom version string for each language's package. import re LANGUAGES = [ - 'core', - 'cpp', - 'csharp', - 'node', - 'objc', + 'core', + 'cpp', + 'csharp', + 'objc', 'php', - 'python', - 'ruby', + 'python', + 'ruby', ] class Version: @@ -84,7 +83,7 @@ class Version: def php_composer(self): """Version string for PHP Composer package""" return '%d.%d.%d' % (self.major, self.minor, self.patch) - + def mako_plugin(dictionary): """Expand version numbers: - for each language, ensure there's a language_version tag in diff --git a/tools/buildgen/plugins/make_fuzzer_tests.py b/tools/buildgen/plugins/make_fuzzer_tests.py index 6d318fe831..56dad2d561 100644 --- a/tools/buildgen/plugins/make_fuzzer_tests.py +++ b/tools/buildgen/plugins/make_fuzzer_tests.py @@ -26,8 +26,8 @@ def mako_plugin(dictionary): new_target['build'] = 'test' new_target['name'] += '_one_entry' new_target['run'] = False - new_target['src'].append('test/core/util/one_corpus_entry_fuzzer.c') - new_target['own_src'].append('test/core/util/one_corpus_entry_fuzzer.c') + new_target['src'].append('test/core/util/one_corpus_entry_fuzzer.cc') + new_target['own_src'].append('test/core/util/one_corpus_entry_fuzzer.cc') targets.append(new_target) for corpus in new_target['corpus_dirs']: for fn in sorted(glob.glob('%s/*' % corpus)): diff --git a/tools/buildgen/plugins/transitive_dependencies.py b/tools/buildgen/plugins/transitive_dependencies.py index 5f37ed13a1..bf5263e685 100644 --- a/tools/buildgen/plugins/transitive_dependencies.py +++ b/tools/buildgen/plugins/transitive_dependencies.py @@ -38,17 +38,16 @@ def transitive_deps(lib, libs): def mako_plugin(dictionary): """The exported plugin code for transitive_dependencies. - Each item in libs, node_modules, and targets can have a deps list. - We add a transitive_deps property to each with the transitive closure - of those dependency lists. + Iterate over each list and check each item for a deps list. We add a + transitive_deps property to each with the transitive closure of those + dependency lists. """ libs = dictionary.get('libs') - node_modules = dictionary.get('node_modules') - targets = dictionary.get('targets') - for target_list in (libs, targets, node_modules): + for target_name, target_list in dictionary.items(): for target in target_list: - target['transitive_deps'] = transitive_deps(target, libs) + if isinstance(target, dict) and 'deps' in target: + target['transitive_deps'] = transitive_deps(target, libs) python_dependencies = dictionary.get('python_dependencies') python_dependencies['transitive_deps'] = ( diff --git a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile deleted file mode 100644 index 0251b2b392..0000000000 --- a/tools/dockerfile/grpc_artifact_linux_x64/Dockerfile +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Docker file for building gRPC artifacts. - -FROM debian:jessie - -RUN apt-get update && apt-get install debian-keyring && apt-key update - -# Install Git and basic packages. -RUN apt-get update && apt-key update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - clang \ - curl \ - gcc \ - gcc-multilib \ - git \ - golang \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -# Install Node dependencies -RUN touch .profile -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" - - -################## -# Ruby dependencies - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -RUN \curl -sSL https://get.rvm.io | bash -s stable - -# Install Ruby 2.1 -RUN /bin/bash -l -c "rvm install ruby-2.1" -RUN /bin/bash -l -c "rvm use --default ruby-2.1" -RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" -RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" -RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc" -RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" - - -################## -# PHP dependencies - -RUN apt-get update && apt-get install -y \ - php5 php5-dev php-pear phpunit - -################## -# Install cross compiler for ARM - -RUN echo 'deb http://emdebian.org/tools/debian/ jessie main' | tee -a /etc/apt/sources.list.d/crosstools.list && \ - curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - - -RUN dpkg --add-architecture armhf && apt-get update && apt-get install -y crossbuild-essential-armhf - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile deleted file mode 100644 index 2d179c8c45..0000000000 --- a/tools/dockerfile/grpc_artifact_linux_x86/Dockerfile +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Docker file for building gRPC artifacts. - -FROM 32bit/debian:jessie - -RUN apt-get update && apt-get install debian-keyring && apt-key update - -# Install Git and basic packages. -RUN apt-get update && apt-key update && apt-get install -y \ - autoconf \ - autotools-dev \ - build-essential \ - bzip2 \ - clang \ - curl \ - gcc \ - gcc-multilib \ - git \ - golang \ - libc6 \ - libc6-dbg \ - libc6-dev \ - libgtest-dev \ - libtool \ - make \ - perl \ - strace \ - python-dev \ - python-setuptools \ - python-yaml \ - telnet \ - unzip \ - wget \ - zip && apt-get clean - -# Install Node dependencies -RUN touch .profile -RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash -RUN /bin/bash -l -c "nvm install 8 && npm install -g node-pre-gyp" - - -################## -# Ruby dependencies - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -RUN \curl -sSL https://get.rvm.io | bash -s stable - -# Install Ruby 2.1 -RUN /bin/bash -l -c "rvm install ruby-2.1" -RUN /bin/bash -l -c "rvm use --default ruby-2.1" -RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" -RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" -RUN /bin/bash -l -c "echo 'rvm --default use ruby-2.1' >> ~/.bashrc" -RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" - -RUN mkdir /var/local/jenkins - -# Define the default command. -CMD ["bash"] diff --git a/tools/dockerfile/grpc_clang_format/Dockerfile b/tools/dockerfile/grpc_clang_format/Dockerfile index dff07feeb6..b3abaef465 100644 --- a/tools/dockerfile/grpc_clang_format/Dockerfile +++ b/tools/dockerfile/grpc_clang_format/Dockerfile @@ -14,11 +14,11 @@ FROM debian:jessie -RUN apt-get update && apt-get -y install wget -RUN echo "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main" >> /etc/apt/sources.list -RUN echo "deb-src http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main" >> /etc/apt/sources.list -RUN wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - -RUN apt-get update && apt-get -y install clang-format-3.8 +RUN apt-get update && apt-get -y install wget xz-utils +RUN wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz +RUN tar xf clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz +RUN ln -s /clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang-format /usr/local/bin/clang-format +ENV CLANG_FORMAT=clang-format ADD clang_format_all_the_things.sh / CMD ["echo 'Run with tools/distrib/clang_format_code.sh'"] diff --git a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh index 9bbb5d4dc1..72471994ee 100755 --- a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh +++ b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh @@ -16,20 +16,20 @@ set -e # directories to run against -DIRS="src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include src/compiler src/node src/csharp src/ruby" +DIRS="src/core/lib src/core/tsi src/core/ext src/cpp test/core test/cpp include src/compiler src/csharp src/ruby" # file matching patterns to check GLOB="*.h *.c *.cc" # clang format command -CLANG_FORMAT=clang-format-3.8 +CLANG_FORMAT=${CLANG_FORMAT:-clang-format-5.0} files= for dir in $DIRS do for glob in $GLOB do - files="$files `find ${CLANG_FORMAT_ROOT}/$dir -name $glob -and -not -name *.generated.* -and -not -name *.pb.h -and -not -name *.pb.c -and -not -name *.pb.cc -and -not -name end2end_tests.c -and -not -name end2end_nosec_tests.c -and -not -name public_headers_must_be_c89.c`" + files="$files `find ${CLANG_FORMAT_ROOT}/$dir -name $glob -and -not -name '*.generated.*' -and -not -name '*.pb.h' -and -not -name '*.pb.c' -and -not -name '*.pb.cc' -and -not -name end2end_tests.cc -and -not -name end2end_nosec_tests.cc -and -not -name public_headers_must_be_c89.c`" done done diff --git a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile index 56b8be89ec..ea82476b65 100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile +++ b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/Dockerfile @@ -22,6 +22,7 @@ RUN apt-get update && apt-get install -y \ bzip2 \ ccache \ curl \ + dnsutils \ gcc \ gcc-multilib \ git \ @@ -61,7 +62,7 @@ RUN apt-get update && apt-get install -y \ # Install Python packages from PyPI RUN pip install --upgrade pip==9.0.1 RUN pip install virtualenv -RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0 +RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.2.0 six==1.10.0 twisted==17.5.0 #================ # C# dependencies diff --git a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh index bd01eacb15..1c25ab32fa 100755..100644 --- a/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh +++ b/tools/dockerfile/interoptest/grpc_interop_csharpcoreclr/build_interop.sh @@ -29,4 +29,4 @@ cp -r /var/local/jenkins/service_account $HOME || true cd /var/local/git/grpc # build C# interop client & server -tools/run_tests/run_tests.py -l csharp -c dbg --compiler coreclr --build_only +tools/run_tests/run_tests.py -l csharp -c dbg --build_only diff --git a/tools/dockerfile/test/sanity/Dockerfile b/tools/dockerfile/test/sanity/Dockerfile index 487ce15e2e..da663d5686 100644 --- a/tools/dockerfile/test/sanity/Dockerfile +++ b/tools/dockerfile/test/sanity/Dockerfile @@ -100,11 +100,11 @@ RUN curl -fSsL -O https://github.com/bazelbuild/bazel/releases/download/0.4.4/ba RUN chmod +x ./bazel-0.4.4-installer-linux-x86_64.sh RUN ./bazel-0.4.4-installer-linux-x86_64.sh -RUN apt-get update && apt-get -y install wget -RUN echo "deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main" >> /etc/apt/sources.list -RUN echo "deb-src http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main" >> /etc/apt/sources.list -RUN wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | apt-key add - -RUN apt-get update && apt-get -y install clang-format-3.8 +RUN apt-get update && apt-get -y install wget xz-utils +RUN wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz +RUN tar xf clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz +RUN ln -s /clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang-format /usr/local/bin/clang-format +ENV CLANG_FORMAT=clang-format # Prepare ccache RUN ln -s /usr/bin/ccache /usr/local/bin/gcc diff --git a/tools/internal_ci/linux/grpc_coverage.sh b/tools/internal_ci/linux/grpc_coverage.sh index 31623d2618..12181f0133 100755 --- a/tools/internal_ci/linux/grpc_coverage.sh +++ b/tools/internal_ci/linux/grpc_coverage.sh @@ -27,4 +27,4 @@ python tools/run_tests/run_tests.py \ -c gcov \ -x report.xml \ -j 16 -
\ No newline at end of file + diff --git a/tools/interop_matrix/README.md b/tools/interop_matrix/README.md index a3717a5a70..588afe4fd4 100644 --- a/tools/interop_matrix/README.md +++ b/tools/interop_matrix/README.md @@ -24,7 +24,7 @@ For more details on each step, refer to sections below. - Create new `Dockerfile.template`, `build_interop.sh.template` for the language/runtime under `template/tools/dockerfile/`. - Run `tools/buildgen/generate_projects.sh` to create corresponding files under `tools/dockerfile/`. - Add language/runtimes to `client_matrix.py` following existing language/runtimes examples. -- Run `tools/interop_matrix/create_matrix_images.py` which will build and upload images to GCR. Unless you are also building images for a gRPC release, make sure not to set `--gcr_tag` (the default tag 'master' is used for testing). +- Run `tools/interop_matrix/create_matrix_images.py` which will build and upload images to GCR. Unless you are also building images for a gRPC release, make sure not to set `--release` (the default release 'master' is used for testing). *: Please delete your docker images at https://pantheon.corp.google.com/gcr/images/grpc-testing?project=grpc-testing afterwards. Permissions to access GrpcTesting project is required for this step. diff --git a/tools/interop_matrix/client_matrix.py b/tools/interop_matrix/client_matrix.py index 23c5ae00c1..51f04ea40b 100644 --- a/tools/interop_matrix/client_matrix.py +++ b/tools/interop_matrix/client_matrix.py @@ -27,6 +27,11 @@ LANG_RUNTIME_MATRIX = { 'cxx': ['cxx'], # This is actually debian8. 'go': ['go1.7', 'go1.8'], 'java': ['java_oracle8'], + 'python': ['python'], + 'node': ['node'], + 'ruby': ['ruby'], + 'php': ['php', 'php7'], + 'csharp': ['csharp', 'csharpcoreclr'], } # Dictionary of releases per language. For each language, we need to provide @@ -59,4 +64,45 @@ LANG_RELEASE_MATRIX = { 'v1.6.1', 'v1.7.0', ], + 'python': [ + #'v1.0.x', #Fail to run the test. #13230. + 'v1.1.4', + 'v1.2.5', + 'v1.3.9', + 'v1.4.2', + 'v1.6.6', + ], + 'node': [ + 'v1.0.1', + 'v1.1.4', + 'v1.2.5', + 'v1.3.9', + 'v1.4.2', + 'v1.6.6', + ], + 'ruby': [ + # Ruby v1.0.x doesn't have the fix #8914, therefore not supported. + 'v1.1.4', + 'v1.2.5', + 'v1.3.9', + 'v1.4.2', + 'v1.6.6', + ], + 'php': [ + 'v1.0.1', + 'v1.1.4', + 'v1.2.5', + 'v1.3.9', + 'v1.4.2', + 'v1.6.6', + ], + 'csharp': [ + # Fail to build images due to #13278. + #'v1.0.1', + #'v1.1.4', + #'v1.2.5', + #'v1.3.9', + 'v1.4.2', + 'v1.6.6', + ], } diff --git a/tools/interop_matrix/create_matrix_images.py b/tools/interop_matrix/create_matrix_images.py index 67355e7fbf..21040eadf2 100755 --- a/tools/interop_matrix/create_matrix_images.py +++ b/tools/interop_matrix/create_matrix_images.py @@ -116,12 +116,13 @@ def add_files_to_image(image, with_files, label=None): subprocess.check_output(build_cmd) dockerjob.remove_image(orig_tag, skip_nonexistent=True) -def build_image_jobspec(runtime, env, gcr_tag): +def build_image_jobspec(runtime, env, gcr_tag, stack_base): """Build interop docker image for a language with runtime. runtime: a <lang><version> string, for example go1.8. env: dictionary of env to passed to the build script. gcr_tag: the tag for the docker image (i.e. v1.3.0). + stack_base: the local gRPC repo path. """ basename = 'grpc_interop_%s' % runtime tag = '%s/%s:%s' % (args.gcr_path, basename, gcr_tag) @@ -132,7 +133,7 @@ def build_image_jobspec(runtime, env, gcr_tag): } build_env.update(env) build_job = jobset.JobSpec( - cmdline=[_IMAGE_BUILDER], + cmdline=[os.path.join(stack_base, _IMAGE_BUILDER)], environ=build_env, shortname='build_docker_%s' % runtime, timeout_seconds=30*60) @@ -172,13 +173,14 @@ def build_all_images_for_release(lang, release): env = {} # If we not using current tree or the sibling for grpc stack, do checkout. + stack_base = '' if args.git_checkout: stack_base = checkout_grpc_stack(lang, release) 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]: - job = build_image_jobspec(runtime, env, release) + job = build_image_jobspec(runtime, env, release, stack_base) docker_images.append(job.tag) build_jobs.append(job) @@ -225,7 +227,6 @@ def checkout_grpc_stack(lang, release): repo_dir = os.path.splitext(os.path.basename(repo))[0] stack_base = os.path.join(args.git_checkout_root, repo_dir) - # Assume the directory is reusable for git checkout. if not os.path.exists(stack_base): subprocess.check_call(['git', 'clone', '--recursive', repo], cwd=os.path.dirname(stack_base)) @@ -238,7 +239,9 @@ def checkout_grpc_stack(lang, release): output = subprocess.check_output( ['git', 'checkout', release], cwd=stack_base, stderr=subprocess.STDOUT) commit_log = subprocess.check_output(['git', 'log', '-1'], cwd=stack_base) - jobset.message('SUCCESS', 'git checkout', output + commit_log, do_newline=True) + jobset.message('SUCCESS', 'git checkout', + '%s: %s' % (str(output), commit_log), + do_newline=True) # Write git log to commit_log so it can be packaged with the docker image. with open(os.path.join(stack_base, 'commit_log'), 'w') as f: diff --git a/tools/interop_matrix/create_testcases.sh b/tools/interop_matrix/create_testcases.sh index 3d34b2ef25..fa33fa4615 100755 --- a/tools/interop_matrix/create_testcases.sh +++ b/tools/interop_matrix/create_testcases.sh @@ -31,13 +31,6 @@ TESTCASES_DIR=${GRPC_ROOT}/tools/interop_matrix/testcases echo "Create '$LANG' test cases for gRPC release '${RELEASE:=master}'" -echo $client_lang -# Invoke run_interop_test in manual mode. -# TODO(adelez): Add cloud_gateways when we figure out how to skip them if not -# running in GCE. -${GRPC_ROOT}/tools/run_tests/run_interop_tests.py -l $LANG --use_docker \ - --cloud_to_prod --prod_servers default gateway_v4 --manual_run - # Clean up function cleanup { [ -z "$testcase" ] && testcase=$CMDS_SH @@ -54,19 +47,28 @@ function cleanup { fi [ -e "$CMDS_SH" ] && rm $CMDS_SH } + +function createtests { +# Invoke run_interop_test in manual mode. +# TODO(adelez): Add cloud_gateways when we figure out how to skip them if not +# running in GCE. +if [ $1 == "cxx" ]; then +client_lang="c++" +else +client_lang=$1 +fi +echo $client_lang + +${GRPC_ROOT}/tools/run_tests/run_interop_tests.py -l $client_lang --use_docker \ + --cloud_to_prod --prod_servers default gateway_v4 --manual_run + trap cleanup EXIT # TODO(adelez): add test auth tests but do not run if not testing on GCE. # Running the testcases as sanity unless we are asked to skip. [ -z "$SKIP_TEST" ] && (echo "Running test cases: $CMDS_SH"; sh $CMDS_SH) -# Convert c++ to cxx. -if [$LANG == "c++" ]; then -client_lang="cxx" -else -client_lang=$LANG -fi mkdir -p $TESTCASES_DIR -testcase=$TESTCASES_DIR/${client_lang}__$RELEASE +testcase=$TESTCASES_DIR/$1__$RELEASE if [ -e $testcase ]; then echo "Updating: $testcase" diff $testcase $CMDS_SH || true @@ -74,3 +76,11 @@ fi mv $CMDS_SH $testcase chmod a+x $testcase echo "Test cases created: $testcase" +} + +if [ $LANG == "csharp" ]; then +createtests "csharp" +createtests "csharpcoreclr" +else +createtests $LANG +fi diff --git a/tools/interop_matrix/run_interop_matrix_tests.py b/tools/interop_matrix/run_interop_matrix_tests.py index bb7a8647c7..491438a292 100755 --- a/tools/interop_matrix/run_interop_matrix_tests.py +++ b/tools/interop_matrix/run_interop_matrix_tests.py @@ -122,13 +122,16 @@ def find_all_images_for_lang(lang): return images # caches test cases (list of JobSpec) loaded from file. Keyed by lang and runtime. -def find_test_cases(lang, release, suite_name): +def find_test_cases(lang, runtime, release, suite_name): """Returns the list of test cases from testcase files per lang/release.""" file_tmpl = os.path.join(os.path.dirname(__file__), 'testcases/%s__%s') testcase_release = release - if not os.path.exists(file_tmpl % (lang, release)): + filename_prefix = lang + if lang == 'csharp': + filename_prefix = runtime + if not os.path.exists(file_tmpl % (filename_prefix, release)): testcase_release = 'master' - testcases = file_tmpl % (lang, testcase_release) + testcases = file_tmpl % (filename_prefix, testcase_release) job_spec_list=[] try: @@ -169,7 +172,12 @@ def run_tests_for_lang(lang, runtime, images): subprocess.check_call(['gcloud', 'docker', '--', 'pull', image]) _docker_images_cleanup.append(image) suite_name = '%s__%s_%s' % (lang, runtime, release) - job_spec_list = find_test_cases(lang, release, suite_name) + job_spec_list = find_test_cases(lang, runtime, release, suite_name) + + if not job_spec_list: + jobset.message('FAILED', 'No test cases were found.', do_newline=True) + return 1 + num_failures, resultset = jobset.run(job_spec_list, newline_on_success=True, add_env={'docker_image':image}, diff --git a/tools/interop_matrix/testcases/csharp__master b/tools/interop_matrix/testcases/csharp__master new file mode 100644 index 0000000000..32f6b38041 --- /dev/null +++ b/tools/interop_matrix/testcases/csharp__master @@ -0,0 +1,20 @@ +#!/bin/bash +echo "Testing ${docker_image:=grpc_interop_csharp:a95229ca-d387-4127-ad48-69a7464e23b8}" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/net45 --net=host $docker_image bash -c "mono Grpc.IntegrationTesting.Client.exe --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" diff --git a/tools/interop_matrix/testcases/csharpcoreclr__master b/tools/interop_matrix/testcases/csharpcoreclr__master new file mode 100644 index 0000000000..37e45989b2 --- /dev/null +++ b/tools/interop_matrix/testcases/csharpcoreclr__master @@ -0,0 +1,20 @@ +#!/bin/bash +echo "Testing ${docker_image:=grpc_interop_csharpcoreclr:c7fbed09-e4c1-4aab-8dd9-1285b2c9598e}" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc/src/csharp/Grpc.IntegrationTesting.Client/bin/Debug/netcoreapp1.0 --net=host $docker_image bash -c "dotnet exec Grpc.IntegrationTesting.Client.dll --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" diff --git a/tools/interop_matrix/testcases/node__master b/tools/interop_matrix/testcases/node__master new file mode 100755 index 0000000000..99ea2f0bc4 --- /dev/null +++ b/tools/interop_matrix/testcases/node__master @@ -0,0 +1,20 @@ +#!/bin/bash +echo "Testing ${docker_image:=grpc_interop_node:1415ecbf-5d0f-423e-8c2c-e0cb6d154e73}" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_nvm.sh node src/node/interop/interop_client.js --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" diff --git a/tools/interop_matrix/testcases/node__v1.0.1 b/tools/interop_matrix/testcases/node__v1.0.1 new file mode 100644 index 0000000000..fca9821544 --- /dev/null +++ b/tools/interop_matrix/testcases/node__v1.0.1 @@ -0,0 +1,21 @@ +#!/bin/bash +echo "Testing ${docker_image:=grpc_interop_node:a53aa5e3-b548-4566-b5a8-6d15c1315b32}" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_00c688f2-57da-4023-89f3-46b1f7b5869f $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_d86705d8-14ea-4024-90b6-de74d6e8d19c $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_ebaafacd-1d82-4a75-bea1-a5c64e01fcaf $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_5125241a-fbf6-4c1c-895b-026a5a41f02f $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_3d5e5b82-7205-4eba-b775-8122f05a4760 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_16fa0b49-2083-4932-8f26-79cfdffec940 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_23cee670-2d8d-4f5c-8893-c3c43da8b03a $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_7b6a9454-e3b6-4993-b542-468e268930aa $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_5a7109ed-c065-4b62-98f4-b3ed8f385762 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test.sandbox.googleapis.com --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_1e0ba8dd-4dc1-431b-b202-529e7ace5d1d $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_649de56a-e722-4a59-b265-e9c0e871f068 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_8be512a2-5e1c-4858-8cfc-82f99b678b76 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_d19b6333-e528-48b5-8421-2ae3f7ce9dab $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_4749c80a-21c5-4d81-9df5-3c46ba6480cd $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_b7bee545-4857-4269-a1f2-9553dfc7e4b8 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_4e96db87-6f48-426d-a7f0-97f3a5b6b3f4 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_31a1d58c-f8bf-460a-af60-28969ecaaf80 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host --name interop_client_node_ce64b147-bcfa-44b2-a2f7-4a485380ce30 $docker_image bash -l -c "node src/node/interop/interop_client.js --server_host=grpc-test4.sandbox.googleapis.com --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" + diff --git a/tools/interop_matrix/testcases/php__master b/tools/interop_matrix/testcases/php__master new file mode 100755 index 0000000000..bce1d30550 --- /dev/null +++ b/tools/interop_matrix/testcases/php__master @@ -0,0 +1,20 @@ +#!/bin/bash +echo "Testing ${docker_image:=grpc_interop_php:b290f404-9940-4968-8fc2-19f5291c8eb7}" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "src/php/bin/interop_client.sh --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" diff --git a/tools/interop_matrix/testcases/ruby__master b/tools/interop_matrix/testcases/ruby__master new file mode 100755 index 0000000000..07bfd05866 --- /dev/null +++ b/tools/interop_matrix/testcases/ruby__master @@ -0,0 +1,20 @@ +#!/bin/bash +echo "Testing ${docker_image:=grpc_interop_ruby:6bd1f0eb-51a4-4ad8-861c-1cbd7a929f33}" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=large_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_unary" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=ping_pong" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=empty_stream" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=client_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=server_streaming" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_begin" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=cancel_after_first_response" +docker run -i --rm=true -w /var/local/git/grpc --net=host $docker_image bash -c "tools/run_tests/interop/with_rvm.sh ruby src/ruby/pb/test/client.rb --server_host=216.239.32.254 --server_host_override=grpc-test4.sandbox.googleapis.com --server_port=443 --use_tls=true --test_case=timeout_on_sleeping_server" diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_main.py b/tools/profiling/microbenchmarks/bm_diff/bm_main.py index 516d110b97..74b7174f5d 100755 --- a/tools/profiling/microbenchmarks/bm_diff/bm_main.py +++ b/tools/profiling/microbenchmarks/bm_diff/bm_main.py @@ -78,7 +78,7 @@ def _args(): '-l', '--loops', type=int, - default=20, + default=10, help='Number of times to loops the benchmarks. More loops cuts down on noise' ) argp.add_argument( diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index 2cc0dfceab..ea202edb30 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -230,50 +230,6 @@ class CSharpExtArtifact: def __str__(self): return self.name - -node_gyp_arch_map = { - 'x86': 'ia32', - 'x64': 'x64' -} - -class NodeExtArtifact: - """Builds Node native extension""" - - def __init__(self, platform, arch): - self.name = 'node_ext_{0}_{1}'.format(platform, arch) - self.platform = platform - self.arch = arch - self.gyp_arch = node_gyp_arch_map[arch] - self.labels = ['artifact', 'node', platform, arch] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform == 'windows': - # Simultaneous builds of node on the same windows machine are flaky. - # Set x86 build as exclusive to make sure there is only one node build - # at a time. See https://github.com/grpc/grpc/issues/8293 - cpu_cost = 1e6 if self.arch != 'x64' else 1.0 - return create_jobspec(self.name, - ['tools\\run_tests\\artifacts\\build_artifact_node.bat', - self.gyp_arch], - use_workspace=True, - timeout_seconds=45*60, - cpu_cost=cpu_cost) - else: - if self.platform == 'linux': - return create_docker_jobspec( - self.name, - 'tools/dockerfile/grpc_artifact_linux_{}'.format(self.arch), - 'tools/run_tests/artifacts/build_artifact_node.sh {} {}'.format( - self.gyp_arch, self.platform)) - else: - return create_jobspec(self.name, - ['tools/run_tests/artifacts/build_artifact_node.sh', - self.gyp_arch, self.platform], - use_workspace=True) - class PHPArtifact: """Builds PHP PECL package""" @@ -344,7 +300,7 @@ class ProtocArtifact: def targets(): """Gets list of supported targets""" return ([Cls(platform, arch) - for Cls in (CSharpExtArtifact, NodeExtArtifact, ProtocArtifact) + for Cls in (CSharpExtArtifact, ProtocArtifact) for platform in ('linux', 'macos', 'windows') for arch in ('x86', 'x64')] + [PythonArtifact('linux', 'x86', 'cp27-cp27m'), diff --git a/tools/run_tests/artifacts/build_artifact_node.bat b/tools/run_tests/artifacts/build_artifact_node.bat deleted file mode 100644 index 7f1d1aad23..0000000000 --- a/tools/run_tests/artifacts/build_artifact_node.bat +++ /dev/null @@ -1,48 +0,0 @@ -@rem Copyright 2016 gRPC authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. - -set node_versions=4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 - -set electron_versions=1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 - -set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm - -del /f /q BUILD || rmdir build /s /q - -call npm update || goto :error - -mkdir -p %ARTIFACTS_OUT% - -for %%v in (%node_versions%) do ( - call .\node_modules\.bin\node-pre-gyp.cmd configure build --target=%%v --target_arch=%1 - -@rem Try again after removing openssl headers - rmdir "%USERPROFILE%\.node-gyp\%%v\include\node\openssl" /S /Q - rmdir "%USERPROFILE%\.node-gyp\iojs-%%v\include\node\openssl" /S /Q - call .\node_modules\.bin\node-pre-gyp.cmd build package --target=%%v --target_arch=%1 || goto :error - - xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error -) - -for %%v in (%electron_versions%) do ( - cmd /V /C "set "HOME=%USERPROFILE%\electron-gyp" && call .\node_modules\.bin\node-pre-gyp.cmd configure rebuild package --runtime=electron --target=%%v --target_arch=%1 --disturl=https://atom.io/download/electron" || goto :error - - xcopy /Y /I /S build\stage\* %ARTIFACTS_OUT%\ || goto :error -) -if %errorlevel% neq 0 exit /b %errorlevel% - -goto :EOF - -:error -exit /b 1 diff --git a/tools/run_tests/artifacts/build_artifact_node.sh b/tools/run_tests/artifacts/build_artifact_node.sh deleted file mode 100755 index 628d880f16..0000000000 --- a/tools/run_tests/artifacts/build_artifact_node.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -NODE_TARGET_ARCH=$1 -NODE_TARGET_OS=$2 -source ~/.nvm/nvm.sh - -nvm use 8 -set -ex - -cd $(dirname $0)/../../.. - -rm -rf build || true - -mkdir -p "${ARTIFACTS_OUT}" - -npm update - -node_versions=( 4.0.0 5.0.0 6.0.0 7.0.0 8.0.0 ) - -electron_versions=( 1.0.0 1.1.0 1.2.0 1.3.0 1.4.0 1.5.0 1.6.0 ) - -for version in ${node_versions[@]} -do - ./node_modules/.bin/node-pre-gyp configure rebuild package --target=$version --target_arch=$NODE_TARGET_ARCH --grpc_alpine=true - cp -r build/stage/* "${ARTIFACTS_OUT}"/ - if [ "$NODE_TARGET_ARCH" == 'x64' ] && [ "$NODE_TARGET_OS" == 'linux' ] - then - # Cross compile for ARM on x64 - CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ LD=arm-linux-gnueabihf-g++ ./node_modules/.bin/node-pre-gyp configure rebuild package testpackage --target=$version --target_arch=arm - cp -r build/stage/* "${ARTIFACTS_OUT}"/ - fi -done - -for version in ${electron_versions[@]} -do - HOME=~/.electron-gyp ./node_modules/.bin/node-pre-gyp configure rebuild package --runtime=electron --target=$version --target_arch=$NODE_TARGET_ARCH --disturl=https://atom.io/download/electron - cp -r build/stage/* "${ARTIFACTS_OUT}"/ -done diff --git a/tools/run_tests/artifacts/build_package_node.sh b/tools/run_tests/artifacts/build_package_node.sh deleted file mode 100755 index 2860f68bc4..0000000000 --- a/tools/run_tests/artifacts/build_package_node.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -source ~/.nvm/nvm.sh - -nvm use 8 -set -ex - -cd $(dirname $0)/../../.. - -base=$(pwd) - -artifacts=$base/artifacts - -mkdir -p $artifacts -cp -r $EXTERNAL_GIT_ROOT/platform={windows,linux,macos}/artifacts/node_ext_*/* $artifacts/ || true - -npm update -npm pack - -cp grpc-*.tgz $artifacts/grpc.tgz - -mkdir -p bin - -cd $base/src/node/health_check -npm pack -cp grpc-health-check-*.tgz $artifacts/ - -cd $base/src/node/tools -npm update -npm pack -cp grpc-tools-*.tgz $artifacts/ -tools_version=$(npm list | grep -oP '(?<=grpc-tools@)\S+') - -output_dir=$artifacts/grpc-precompiled-binaries/node/grpc-tools/v$tools_version -mkdir -p $output_dir - -well_known_protos=( any api compiler/plugin descriptor duration empty field_mask source_context struct timestamp type wrappers ) - -for arch in {x86,x64}; do - case $arch in - x86) - node_arch=ia32 - ;; - *) - node_arch=$arch - ;; - esac - for plat in {windows,linux,macos}; do - case $plat in - windows) - node_plat=win32 - ;; - macos) - node_plat=darwin - ;; - *) - node_plat=$plat - ;; - esac - rm -r bin/* - input_dir="$EXTERNAL_GIT_ROOT/platform=${plat}/artifacts/protoc_${plat}_${arch}" - cp $input_dir/protoc* bin/ - cp $input_dir/grpc_node_plugin* bin/ - mkdir -p bin/google/protobuf - mkdir -p bin/google/protobuf/compiler # needed for plugin.proto - for proto in "${well_known_protos[@]}"; do - cp $base/third_party/protobuf/src/google/protobuf/$proto.proto bin/google/protobuf/$proto.proto - done - tar -czf $output_dir/$node_plat-$node_arch.tar.gz bin/ - done -done diff --git a/tools/run_tests/artifacts/distribtest_targets.py b/tools/run_tests/artifacts/distribtest_targets.py index 797ed51c7f..9959651b6c 100644 --- a/tools/run_tests/artifacts/distribtest_targets.py +++ b/tools/run_tests/artifacts/distribtest_targets.py @@ -121,50 +121,6 @@ class CSharpDistribTest(object): def __str__(self): return self.name -class NodeDistribTest(object): - """Tests Node package""" - - def __init__(self, platform, arch, docker_suffix, node_version): - self.name = 'node_npm_%s_%s_%s' % (platform, arch, node_version) - self.platform = platform - self.arch = arch - self.node_version = node_version - self.labels = ['distribtest', 'node', platform, arch, - 'node-%s' % node_version] - if docker_suffix is not None: - self.name += '_%s' % docker_suffix - self.docker_suffix = docker_suffix - self.labels.append(docker_suffix) - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - if self.platform == 'linux': - linux32 = '' - if self.arch == 'x86': - linux32 = 'linux32' - return create_docker_jobspec(self.name, - 'tools/dockerfile/distribtest/node_%s_%s' % ( - self.docker_suffix, - self.arch), - '%s test/distrib/node/run_distrib_test.sh %s' % ( - linux32, - self.node_version), - copy_rel_path='test/distrib') - elif self.platform == 'macos': - return create_jobspec(self.name, - ['test/distrib/node/run_distrib_test.sh', - str(self.node_version)], - environ={'EXTERNAL_GIT_ROOT': '../../../..'}, - use_workspace=True) - else: - raise Exception("Not supported yet.") - - def __str__(self): - return self.name - - class PythonDistribTest(object): """Tests Python package""" @@ -329,14 +285,6 @@ def targets(): RubyDistribTest('linux', 'x64', 'ubuntu1504'), RubyDistribTest('linux', 'x64', 'ubuntu1510'), RubyDistribTest('linux', 'x64', 'ubuntu1604'), - NodeDistribTest('macos', 'x64', None, '4'), - NodeDistribTest('macos', 'x64', None, '5'), - NodeDistribTest('linux', 'x86', 'jessie', '4'), PHPDistribTest('linux', 'x64', 'jessie'), PHPDistribTest('macos', 'x64'), - ] + [ - NodeDistribTest('linux', 'x64', os, version) - for os in ('wheezy', 'jessie', 'ubuntu1204', 'ubuntu1404', - 'ubuntu1504', 'ubuntu1510', 'ubuntu1604') - for version in ('4', '5') ] diff --git a/tools/run_tests/artifacts/package_targets.py b/tools/run_tests/artifacts/package_targets.py index 671d0f7b45..ff93bb30e8 100644 --- a/tools/run_tests/artifacts/package_targets.py +++ b/tools/run_tests/artifacts/package_targets.py @@ -89,24 +89,6 @@ class CSharpPackage: def __str__(self): return self.name - -class NodePackage: - """Builds Node NPM package and collects precompiled binaries""" - - def __init__(self): - self.name = 'node_package' - self.labels = ['package', 'node', 'linux'] - - def pre_build_jobspecs(self): - return [] - - def build_jobspec(self): - return create_docker_jobspec( - self.name, - 'tools/dockerfile/grpc_artifact_linux_x64', - 'tools/run_tests/artifacts/build_package_node.sh') - - class RubyPackage: """Collects ruby gems created in the artifact phase""" @@ -162,7 +144,6 @@ def targets(): """Gets list of supported targets""" return [CSharpPackage(), CSharpPackage(linux=True), - NodePackage(), RubyPackage(), PythonPackage(), PHPPackage()] diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index b74e49fa2c..6cd9a04056 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -13,7 +13,7 @@ "language": "c", "name": "alarm_test", "src": [ - "test/core/surface/alarm_test.c" + "test/core/surface/alarm_test.cc" ], "third_party": false, "type": "target" @@ -30,7 +30,7 @@ "language": "c", "name": "algorithm_test", "src": [ - "test/core/compression/algorithm_test.c" + "test/core/compression/algorithm_test.cc" ], "third_party": false, "type": "target" @@ -45,7 +45,7 @@ "language": "c", "name": "alloc_test", "src": [ - "test/core/support/alloc_test.c" + "test/core/support/alloc_test.cc" ], "third_party": false, "type": "target" @@ -62,7 +62,7 @@ "language": "c", "name": "alpn_test", "src": [ - "test/core/transport/chttp2/alpn_test.c" + "test/core/transport/chttp2/alpn_test.cc" ], "third_party": false, "type": "target" @@ -79,7 +79,7 @@ "language": "c", "name": "api_fuzzer", "src": [ - "test/core/end2end/fuzzers/api_fuzzer.c" + "test/core/end2end/fuzzers/api_fuzzer.cc" ], "third_party": false, "type": "target" @@ -94,7 +94,7 @@ "language": "c", "name": "arena_test", "src": [ - "test/core/support/arena_test.c" + "test/core/support/arena_test.cc" ], "third_party": false, "type": "target" @@ -111,7 +111,7 @@ "language": "c", "name": "backoff_test", "src": [ - "test/core/backoff/backoff_test.c" + "test/core/backoff/backoff_test.cc" ], "third_party": false, "type": "target" @@ -129,7 +129,7 @@ "language": "c", "name": "bad_server_response_test", "src": [ - "test/core/end2end/bad_server_response_test.c" + "test/core/end2end/bad_server_response_test.cc" ], "third_party": false, "type": "target" @@ -144,7 +144,7 @@ "language": "c", "name": "bin_decoder_test", "src": [ - "test/core/transport/chttp2/bin_decoder_test.c" + "test/core/transport/chttp2/bin_decoder_test.cc" ], "third_party": false, "type": "target" @@ -159,7 +159,7 @@ "language": "c", "name": "bin_encoder_test", "src": [ - "test/core/transport/chttp2/bin_encoder_test.c" + "test/core/transport/chttp2/bin_encoder_test.cc" ], "third_party": false, "type": "target" @@ -176,7 +176,7 @@ "language": "c", "name": "byte_stream_test", "src": [ - "test/core/transport/byte_stream_test.c" + "test/core/transport/byte_stream_test.cc" ], "third_party": false, "type": "target" @@ -193,7 +193,7 @@ "language": "c", "name": "channel_create_test", "src": [ - "test/core/surface/channel_create_test.c" + "test/core/surface/channel_create_test.cc" ], "third_party": false, "type": "target" @@ -225,7 +225,7 @@ "language": "c", "name": "chttp2_hpack_encoder_test", "src": [ - "test/core/transport/chttp2/hpack_encoder_test.c" + "test/core/transport/chttp2/hpack_encoder_test.cc" ], "third_party": false, "type": "target" @@ -242,7 +242,7 @@ "language": "c", "name": "chttp2_stream_map_test", "src": [ - "test/core/transport/chttp2/stream_map_test.c" + "test/core/transport/chttp2/stream_map_test.cc" ], "third_party": false, "type": "target" @@ -259,7 +259,7 @@ "language": "c", "name": "chttp2_varint_test", "src": [ - "test/core/transport/chttp2/varint_test.c" + "test/core/transport/chttp2/varint_test.cc" ], "third_party": false, "type": "target" @@ -276,7 +276,7 @@ "language": "c", "name": "client_fuzzer", "src": [ - "test/core/end2end/fuzzers/client_fuzzer.c" + "test/core/end2end/fuzzers/client_fuzzer.cc" ], "third_party": false, "type": "target" @@ -293,7 +293,7 @@ "language": "c", "name": "combiner_test", "src": [ - "test/core/iomgr/combiner_test.c" + "test/core/iomgr/combiner_test.cc" ], "third_party": false, "type": "target" @@ -310,7 +310,7 @@ "language": "c", "name": "compression_test", "src": [ - "test/core/compression/compression_test.c" + "test/core/compression/compression_test.cc" ], "third_party": false, "type": "target" @@ -327,7 +327,7 @@ "language": "c", "name": "concurrent_connectivity_test", "src": [ - "test/core/surface/concurrent_connectivity_test.c" + "test/core/surface/concurrent_connectivity_test.cc" ], "third_party": false, "type": "target" @@ -344,7 +344,7 @@ "language": "c", "name": "connection_refused_test", "src": [ - "test/core/end2end/connection_refused_test.c" + "test/core/end2end/connection_refused_test.cc" ], "third_party": false, "type": "target" @@ -361,7 +361,7 @@ "language": "c", "name": "dns_resolver_connectivity_test", "src": [ - "test/core/client_channel/resolvers/dns_resolver_connectivity_test.c" + "test/core/client_channel/resolvers/dns_resolver_connectivity_test.cc" ], "third_party": false, "type": "target" @@ -378,7 +378,7 @@ "language": "c", "name": "dns_resolver_test", "src": [ - "test/core/client_channel/resolvers/dns_resolver_test.c" + "test/core/client_channel/resolvers/dns_resolver_test.cc" ], "third_party": false, "type": "target" @@ -395,7 +395,7 @@ "language": "c", "name": "dualstack_socket_test", "src": [ - "test/core/end2end/dualstack_socket_test.c" + "test/core/end2end/dualstack_socket_test.cc" ], "third_party": false, "type": "target" @@ -412,7 +412,7 @@ "language": "c", "name": "endpoint_pair_test", "src": [ - "test/core/iomgr/endpoint_pair_test.c" + "test/core/iomgr/endpoint_pair_test.cc" ], "third_party": false, "type": "target" @@ -429,7 +429,7 @@ "language": "c", "name": "error_test", "src": [ - "test/core/iomgr/error_test.c" + "test/core/iomgr/error_test.cc" ], "third_party": false, "type": "target" @@ -446,7 +446,7 @@ "language": "c", "name": "ev_epollsig_linux_test", "src": [ - "test/core/iomgr/ev_epollsig_linux_test.c" + "test/core/iomgr/ev_epollsig_linux_test.cc" ], "third_party": false, "type": "target" @@ -463,7 +463,7 @@ "language": "c", "name": "fake_resolver_test", "src": [ - "test/core/client_channel/resolvers/fake_resolver_test.c" + "test/core/client_channel/resolvers/fake_resolver_test.cc" ], "third_party": false, "type": "target" @@ -480,7 +480,7 @@ "language": "c", "name": "fake_transport_security_test", "src": [ - "test/core/tsi/fake_transport_security_test.c" + "test/core/tsi/fake_transport_security_test.cc" ], "third_party": false, "type": "target" @@ -497,7 +497,7 @@ "language": "c", "name": "fd_conservation_posix_test", "src": [ - "test/core/iomgr/fd_conservation_posix_test.c" + "test/core/iomgr/fd_conservation_posix_test.cc" ], "third_party": false, "type": "target" @@ -514,7 +514,7 @@ "language": "c", "name": "fd_posix_test", "src": [ - "test/core/iomgr/fd_posix_test.c" + "test/core/iomgr/fd_posix_test.cc" ], "third_party": false, "type": "target" @@ -531,7 +531,7 @@ "language": "c", "name": "fling_client", "src": [ - "test/core/fling/client.c" + "test/core/fling/client.cc" ], "third_party": false, "type": "target" @@ -548,7 +548,7 @@ "language": "c", "name": "fling_server", "src": [ - "test/core/fling/server.c" + "test/core/fling/server.cc" ], "third_party": false, "type": "target" @@ -565,7 +565,7 @@ "language": "c", "name": "fling_stream_test", "src": [ - "test/core/fling/fling_stream_test.c" + "test/core/fling/fling_stream_test.cc" ], "third_party": false, "type": "target" @@ -582,7 +582,7 @@ "language": "c", "name": "fling_test", "src": [ - "test/core/fling/fling_test.c" + "test/core/fling/fling_test.cc" ], "third_party": false, "type": "target" @@ -638,7 +638,7 @@ "language": "c", "name": "goaway_server_test", "src": [ - "test/core/end2end/goaway_server_test.c" + "test/core/end2end/goaway_server_test.cc" ], "third_party": false, "type": "target" @@ -653,7 +653,7 @@ "language": "c", "name": "gpr_avl_test", "src": [ - "test/core/support/avl_test.c" + "test/core/support/avl_test.cc" ], "third_party": false, "type": "target" @@ -668,7 +668,7 @@ "language": "c", "name": "gpr_cmdline_test", "src": [ - "test/core/support/cmdline_test.c" + "test/core/support/cmdline_test.cc" ], "third_party": false, "type": "target" @@ -683,7 +683,7 @@ "language": "c", "name": "gpr_cpu_test", "src": [ - "test/core/support/cpu_test.c" + "test/core/support/cpu_test.cc" ], "third_party": false, "type": "target" @@ -698,7 +698,7 @@ "language": "c", "name": "gpr_env_test", "src": [ - "test/core/support/env_test.c" + "test/core/support/env_test.cc" ], "third_party": false, "type": "target" @@ -713,7 +713,7 @@ "language": "c", "name": "gpr_histogram_test", "src": [ - "test/core/support/histogram_test.c" + "test/core/support/histogram_test.cc" ], "third_party": false, "type": "target" @@ -728,7 +728,7 @@ "language": "c", "name": "gpr_host_port_test", "src": [ - "test/core/support/host_port_test.c" + "test/core/support/host_port_test.cc" ], "third_party": false, "type": "target" @@ -743,7 +743,7 @@ "language": "c", "name": "gpr_log_test", "src": [ - "test/core/support/log_test.c" + "test/core/support/log_test.cc" ], "third_party": false, "type": "target" @@ -758,7 +758,7 @@ "language": "c", "name": "gpr_mpscq_test", "src": [ - "test/core/support/mpscq_test.c" + "test/core/support/mpscq_test.cc" ], "third_party": false, "type": "target" @@ -773,7 +773,7 @@ "language": "c", "name": "gpr_spinlock_test", "src": [ - "test/core/support/spinlock_test.c" + "test/core/support/spinlock_test.cc" ], "third_party": false, "type": "target" @@ -788,7 +788,7 @@ "language": "c", "name": "gpr_stack_lockfree_test", "src": [ - "test/core/support/stack_lockfree_test.c" + "test/core/support/stack_lockfree_test.cc" ], "third_party": false, "type": "target" @@ -803,7 +803,7 @@ "language": "c", "name": "gpr_string_test", "src": [ - "test/core/support/string_test.c" + "test/core/support/string_test.cc" ], "third_party": false, "type": "target" @@ -818,7 +818,7 @@ "language": "c", "name": "gpr_sync_test", "src": [ - "test/core/support/sync_test.c" + "test/core/support/sync_test.cc" ], "third_party": false, "type": "target" @@ -833,7 +833,7 @@ "language": "c", "name": "gpr_thd_test", "src": [ - "test/core/support/thd_test.c" + "test/core/support/thd_test.cc" ], "third_party": false, "type": "target" @@ -848,7 +848,7 @@ "language": "c", "name": "gpr_time_test", "src": [ - "test/core/support/time_test.c" + "test/core/support/time_test.cc" ], "third_party": false, "type": "target" @@ -863,7 +863,7 @@ "language": "c", "name": "gpr_tls_test", "src": [ - "test/core/support/tls_test.c" + "test/core/support/tls_test.cc" ], "third_party": false, "type": "target" @@ -878,7 +878,7 @@ "language": "c", "name": "gpr_useful_test", "src": [ - "test/core/support/useful_test.c" + "test/core/support/useful_test.cc" ], "third_party": false, "type": "target" @@ -895,7 +895,7 @@ "language": "c", "name": "grpc_auth_context_test", "src": [ - "test/core/security/auth_context_test.c" + "test/core/security/auth_context_test.cc" ], "third_party": false, "type": "target" @@ -912,7 +912,7 @@ "language": "c", "name": "grpc_b64_test", "src": [ - "test/core/slice/b64_test.c" + "test/core/slice/b64_test.cc" ], "third_party": false, "type": "target" @@ -929,7 +929,7 @@ "language": "c", "name": "grpc_byte_buffer_reader_test", "src": [ - "test/core/surface/byte_buffer_reader_test.c" + "test/core/surface/byte_buffer_reader_test.cc" ], "third_party": false, "type": "target" @@ -946,7 +946,7 @@ "language": "c", "name": "grpc_channel_args_test", "src": [ - "test/core/channel/channel_args_test.c" + "test/core/channel/channel_args_test.cc" ], "third_party": false, "type": "target" @@ -963,7 +963,7 @@ "language": "c", "name": "grpc_channel_stack_builder_test", "src": [ - "test/core/channel/channel_stack_builder_test.c" + "test/core/channel/channel_stack_builder_test.cc" ], "third_party": false, "type": "target" @@ -980,7 +980,7 @@ "language": "c", "name": "grpc_channel_stack_test", "src": [ - "test/core/channel/channel_stack_test.c" + "test/core/channel/channel_stack_test.cc" ], "third_party": false, "type": "target" @@ -997,7 +997,7 @@ "language": "c", "name": "grpc_completion_queue_test", "src": [ - "test/core/surface/completion_queue_test.c" + "test/core/surface/completion_queue_test.cc" ], "third_party": false, "type": "target" @@ -1014,7 +1014,7 @@ "language": "c", "name": "grpc_completion_queue_threading_test", "src": [ - "test/core/surface/completion_queue_threading_test.c" + "test/core/surface/completion_queue_threading_test.cc" ], "third_party": false, "type": "target" @@ -1029,7 +1029,7 @@ "language": "c", "name": "grpc_create_jwt", "src": [ - "test/core/security/create_jwt.c" + "test/core/security/create_jwt.cc" ], "third_party": false, "type": "target" @@ -1046,7 +1046,7 @@ "language": "c", "name": "grpc_credentials_test", "src": [ - "test/core/security/credentials_test.c" + "test/core/security/credentials_test.cc" ], "third_party": false, "type": "target" @@ -1063,7 +1063,7 @@ "language": "c", "name": "grpc_fetch_oauth2", "src": [ - "test/core/security/fetch_oauth2.c" + "test/core/security/fetch_oauth2.cc" ], "third_party": false, "type": "target" @@ -1080,7 +1080,7 @@ "language": "c", "name": "grpc_invalid_channel_args_test", "src": [ - "test/core/surface/invalid_channel_args_test.c" + "test/core/surface/invalid_channel_args_test.cc" ], "third_party": false, "type": "target" @@ -1097,7 +1097,7 @@ "language": "c", "name": "grpc_json_token_test", "src": [ - "test/core/security/json_token_test.c" + "test/core/security/json_token_test.cc" ], "third_party": false, "type": "target" @@ -1114,7 +1114,7 @@ "language": "c", "name": "grpc_jwt_verifier_test", "src": [ - "test/core/security/jwt_verifier_test.c" + "test/core/security/jwt_verifier_test.cc" ], "third_party": false, "type": "target" @@ -1129,7 +1129,7 @@ "language": "c", "name": "grpc_print_google_default_creds_token", "src": [ - "test/core/security/print_google_default_creds_token.c" + "test/core/security/print_google_default_creds_token.cc" ], "third_party": false, "type": "target" @@ -1146,7 +1146,7 @@ "language": "c", "name": "grpc_security_connector_test", "src": [ - "test/core/security/security_connector_test.c" + "test/core/security/security_connector_test.cc" ], "third_party": false, "type": "target" @@ -1163,7 +1163,7 @@ "language": "c", "name": "grpc_ssl_credentials_test", "src": [ - "test/core/security/ssl_credentials_test.c" + "test/core/security/ssl_credentials_test.cc" ], "third_party": false, "type": "target" @@ -1178,7 +1178,7 @@ "language": "c", "name": "grpc_verify_jwt", "src": [ - "test/core/security/verify_jwt.c" + "test/core/security/verify_jwt.cc" ], "third_party": false, "type": "target" @@ -1195,7 +1195,7 @@ "language": "c", "name": "handshake_client", "src": [ - "test/core/handshake/client_ssl.c" + "test/core/handshake/client_ssl.cc" ], "third_party": false, "type": "target" @@ -1212,7 +1212,7 @@ "language": "c", "name": "handshake_server", "src": [ - "test/core/handshake/server_ssl.c" + "test/core/handshake/server_ssl.cc" ], "third_party": false, "type": "target" @@ -1229,7 +1229,7 @@ "language": "c", "name": "hpack_parser_fuzzer_test", "src": [ - "test/core/transport/chttp2/hpack_parser_fuzzer_test.c" + "test/core/transport/chttp2/hpack_parser_fuzzer_test.cc" ], "third_party": false, "type": "target" @@ -1246,7 +1246,7 @@ "language": "c", "name": "hpack_parser_test", "src": [ - "test/core/transport/chttp2/hpack_parser_test.c" + "test/core/transport/chttp2/hpack_parser_test.cc" ], "third_party": false, "type": "target" @@ -1263,7 +1263,7 @@ "language": "c", "name": "hpack_table_test", "src": [ - "test/core/transport/chttp2/hpack_table_test.c" + "test/core/transport/chttp2/hpack_table_test.cc" ], "third_party": false, "type": "target" @@ -1280,7 +1280,7 @@ "language": "c", "name": "http_parser_test", "src": [ - "test/core/http/parser_test.c" + "test/core/http/parser_test.cc" ], "third_party": false, "type": "target" @@ -1297,7 +1297,7 @@ "language": "c", "name": "http_request_fuzzer_test", "src": [ - "test/core/http/request_fuzzer.c" + "test/core/http/request_fuzzer.cc" ], "third_party": false, "type": "target" @@ -1314,7 +1314,7 @@ "language": "c", "name": "http_response_fuzzer_test", "src": [ - "test/core/http/response_fuzzer.c" + "test/core/http/response_fuzzer.cc" ], "third_party": false, "type": "target" @@ -1331,7 +1331,7 @@ "language": "c", "name": "httpcli_format_request_test", "src": [ - "test/core/http/format_request_test.c" + "test/core/http/format_request_test.cc" ], "third_party": false, "type": "target" @@ -1348,7 +1348,7 @@ "language": "c", "name": "httpcli_test", "src": [ - "test/core/http/httpcli_test.c" + "test/core/http/httpcli_test.cc" ], "third_party": false, "type": "target" @@ -1365,7 +1365,7 @@ "language": "c", "name": "httpscli_test", "src": [ - "test/core/http/httpscli_test.c" + "test/core/http/httpscli_test.cc" ], "third_party": false, "type": "target" @@ -1382,7 +1382,7 @@ "language": "c", "name": "init_test", "src": [ - "test/core/surface/init_test.c" + "test/core/surface/init_test.cc" ], "third_party": false, "type": "target" @@ -1399,7 +1399,7 @@ "language": "c", "name": "invalid_call_argument_test", "src": [ - "test/core/end2end/invalid_call_argument_test.c" + "test/core/end2end/invalid_call_argument_test.cc" ], "third_party": false, "type": "target" @@ -1416,7 +1416,7 @@ "language": "c", "name": "json_fuzzer_test", "src": [ - "test/core/json/fuzzer.c" + "test/core/json/fuzzer.cc" ], "third_party": false, "type": "target" @@ -1431,7 +1431,7 @@ "language": "c", "name": "json_rewrite", "src": [ - "test/core/json/json_rewrite.c" + "test/core/json/json_rewrite.cc" ], "third_party": false, "type": "target" @@ -1448,7 +1448,7 @@ "language": "c", "name": "json_rewrite_test", "src": [ - "test/core/json/json_rewrite_test.c" + "test/core/json/json_rewrite_test.cc" ], "third_party": false, "type": "target" @@ -1465,7 +1465,7 @@ "language": "c", "name": "json_stream_error_test", "src": [ - "test/core/json/json_stream_error_test.c" + "test/core/json/json_stream_error_test.cc" ], "third_party": false, "type": "target" @@ -1482,7 +1482,7 @@ "language": "c", "name": "json_test", "src": [ - "test/core/json/json_test.c" + "test/core/json/json_test.cc" ], "third_party": false, "type": "target" @@ -1499,7 +1499,7 @@ "language": "c", "name": "lame_client_test", "src": [ - "test/core/surface/lame_client_test.c" + "test/core/surface/lame_client_test.cc" ], "third_party": false, "type": "target" @@ -1516,7 +1516,7 @@ "language": "c", "name": "lb_policies_test", "src": [ - "test/core/client_channel/lb_policies_test.c" + "test/core/client_channel/lb_policies_test.cc" ], "third_party": false, "type": "target" @@ -1533,7 +1533,7 @@ "language": "c", "name": "load_file_test", "src": [ - "test/core/iomgr/load_file_test.c" + "test/core/iomgr/load_file_test.cc" ], "third_party": false, "type": "target" @@ -1550,7 +1550,7 @@ "language": "c", "name": "low_level_ping_pong_benchmark", "src": [ - "test/core/network_benchmarks/low_level_ping_pong.c" + "test/core/network_benchmarks/low_level_ping_pong.cc" ], "third_party": false, "type": "target" @@ -1567,7 +1567,7 @@ "language": "c", "name": "memory_profile_client", "src": [ - "test/core/memory_usage/client.c" + "test/core/memory_usage/client.cc" ], "third_party": false, "type": "target" @@ -1584,7 +1584,7 @@ "language": "c", "name": "memory_profile_server", "src": [ - "test/core/memory_usage/server.c" + "test/core/memory_usage/server.cc" ], "third_party": false, "type": "target" @@ -1601,7 +1601,7 @@ "language": "c", "name": "memory_profile_test", "src": [ - "test/core/memory_usage/memory_usage_test.c" + "test/core/memory_usage/memory_usage_test.cc" ], "third_party": false, "type": "target" @@ -1618,7 +1618,7 @@ "language": "c", "name": "message_compress_test", "src": [ - "test/core/compression/message_compress_test.c" + "test/core/compression/message_compress_test.cc" ], "third_party": false, "type": "target" @@ -1635,7 +1635,7 @@ "language": "c", "name": "minimal_stack_is_minimal_test", "src": [ - "test/core/channel/minimal_stack_is_minimal_test.c" + "test/core/channel/minimal_stack_is_minimal_test.cc" ], "third_party": false, "type": "target" @@ -1652,7 +1652,7 @@ "language": "c", "name": "multiple_server_queues_test", "src": [ - "test/core/end2end/multiple_server_queues_test.c" + "test/core/end2end/multiple_server_queues_test.cc" ], "third_party": false, "type": "target" @@ -1667,7 +1667,7 @@ "language": "c", "name": "murmur_hash_test", "src": [ - "test/core/support/murmur_hash_test.c" + "test/core/support/murmur_hash_test.cc" ], "third_party": false, "type": "target" @@ -1684,7 +1684,7 @@ "language": "c", "name": "nanopb_fuzzer_response_test", "src": [ - "test/core/nanopb/fuzzer_response.c" + "test/core/nanopb/fuzzer_response.cc" ], "third_party": false, "type": "target" @@ -1701,7 +1701,7 @@ "language": "c", "name": "nanopb_fuzzer_serverlist_test", "src": [ - "test/core/nanopb/fuzzer_serverlist.c" + "test/core/nanopb/fuzzer_serverlist.cc" ], "third_party": false, "type": "target" @@ -1718,7 +1718,7 @@ "language": "c", "name": "no_server_test", "src": [ - "test/core/end2end/no_server_test.c" + "test/core/end2end/no_server_test.cc" ], "third_party": false, "type": "target" @@ -1735,7 +1735,7 @@ "language": "c", "name": "num_external_connectivity_watchers_test", "src": [ - "test/core/surface/num_external_connectivity_watchers_test.c" + "test/core/surface/num_external_connectivity_watchers_test.cc" ], "third_party": false, "type": "target" @@ -1752,7 +1752,7 @@ "language": "c", "name": "parse_address_test", "src": [ - "test/core/client_channel/parse_address_test.c" + "test/core/client_channel/parse_address_test.cc" ], "third_party": false, "type": "target" @@ -1769,7 +1769,7 @@ "language": "c", "name": "percent_decode_fuzzer", "src": [ - "test/core/slice/percent_decode_fuzzer.c" + "test/core/slice/percent_decode_fuzzer.cc" ], "third_party": false, "type": "target" @@ -1786,7 +1786,7 @@ "language": "c", "name": "percent_encode_fuzzer", "src": [ - "test/core/slice/percent_encode_fuzzer.c" + "test/core/slice/percent_encode_fuzzer.cc" ], "third_party": false, "type": "target" @@ -1803,7 +1803,7 @@ "language": "c", "name": "percent_encoding_test", "src": [ - "test/core/slice/percent_encoding_test.c" + "test/core/slice/percent_encoding_test.cc" ], "third_party": false, "type": "target" @@ -1820,7 +1820,7 @@ "language": "c", "name": "pollset_set_test", "src": [ - "test/core/iomgr/pollset_set_test.c" + "test/core/iomgr/pollset_set_test.cc" ], "third_party": false, "type": "target" @@ -1837,7 +1837,7 @@ "language": "c", "name": "resolve_address_posix_test", "src": [ - "test/core/iomgr/resolve_address_posix_test.c" + "test/core/iomgr/resolve_address_posix_test.cc" ], "third_party": false, "type": "target" @@ -1854,7 +1854,7 @@ "language": "c", "name": "resolve_address_test", "src": [ - "test/core/iomgr/resolve_address_test.c" + "test/core/iomgr/resolve_address_test.cc" ], "third_party": false, "type": "target" @@ -1871,7 +1871,7 @@ "language": "c", "name": "resource_quota_test", "src": [ - "test/core/iomgr/resource_quota_test.c" + "test/core/iomgr/resource_quota_test.cc" ], "third_party": false, "type": "target" @@ -1888,7 +1888,7 @@ "language": "c", "name": "secure_channel_create_test", "src": [ - "test/core/surface/secure_channel_create_test.c" + "test/core/surface/secure_channel_create_test.cc" ], "third_party": false, "type": "target" @@ -1905,7 +1905,7 @@ "language": "c", "name": "secure_endpoint_test", "src": [ - "test/core/security/secure_endpoint_test.c" + "test/core/security/secure_endpoint_test.cc" ], "third_party": false, "type": "target" @@ -1922,7 +1922,7 @@ "language": "c", "name": "sequential_connectivity_test", "src": [ - "test/core/surface/sequential_connectivity_test.c" + "test/core/surface/sequential_connectivity_test.cc" ], "third_party": false, "type": "target" @@ -1939,7 +1939,7 @@ "language": "c", "name": "server_chttp2_test", "src": [ - "test/core/surface/server_chttp2_test.c" + "test/core/surface/server_chttp2_test.cc" ], "third_party": false, "type": "target" @@ -1956,7 +1956,7 @@ "language": "c", "name": "server_fuzzer", "src": [ - "test/core/end2end/fuzzers/server_fuzzer.c" + "test/core/end2end/fuzzers/server_fuzzer.cc" ], "third_party": false, "type": "target" @@ -1973,7 +1973,7 @@ "language": "c", "name": "server_test", "src": [ - "test/core/surface/server_test.c" + "test/core/surface/server_test.cc" ], "third_party": false, "type": "target" @@ -1990,7 +1990,7 @@ "language": "c", "name": "slice_buffer_test", "src": [ - "test/core/slice/slice_buffer_test.c" + "test/core/slice/slice_buffer_test.cc" ], "third_party": false, "type": "target" @@ -2007,7 +2007,7 @@ "language": "c", "name": "slice_hash_table_test", "src": [ - "test/core/slice/slice_hash_table_test.c" + "test/core/slice/slice_hash_table_test.cc" ], "third_party": false, "type": "target" @@ -2024,7 +2024,7 @@ "language": "c", "name": "slice_string_helpers_test", "src": [ - "test/core/slice/slice_string_helpers_test.c" + "test/core/slice/slice_string_helpers_test.cc" ], "third_party": false, "type": "target" @@ -2041,7 +2041,7 @@ "language": "c", "name": "slice_test", "src": [ - "test/core/slice/slice_test.c" + "test/core/slice/slice_test.cc" ], "third_party": false, "type": "target" @@ -2058,7 +2058,7 @@ "language": "c", "name": "sockaddr_resolver_test", "src": [ - "test/core/client_channel/resolvers/sockaddr_resolver_test.c" + "test/core/client_channel/resolvers/sockaddr_resolver_test.cc" ], "third_party": false, "type": "target" @@ -2075,7 +2075,7 @@ "language": "c", "name": "sockaddr_utils_test", "src": [ - "test/core/iomgr/sockaddr_utils_test.c" + "test/core/iomgr/sockaddr_utils_test.cc" ], "third_party": false, "type": "target" @@ -2092,7 +2092,7 @@ "language": "c", "name": "socket_utils_test", "src": [ - "test/core/iomgr/socket_utils_test.c" + "test/core/iomgr/socket_utils_test.cc" ], "third_party": false, "type": "target" @@ -2109,7 +2109,7 @@ "language": "c", "name": "ssl_server_fuzzer", "src": [ - "test/core/security/ssl_server_fuzzer.c" + "test/core/security/ssl_server_fuzzer.cc" ], "third_party": false, "type": "target" @@ -2126,7 +2126,7 @@ "language": "c", "name": "ssl_transport_security_test", "src": [ - "test/core/tsi/ssl_transport_security_test.c" + "test/core/tsi/ssl_transport_security_test.cc" ], "third_party": false, "type": "target" @@ -2143,7 +2143,7 @@ "language": "c", "name": "status_conversion_test", "src": [ - "test/core/transport/status_conversion_test.c" + "test/core/transport/status_conversion_test.cc" ], "third_party": false, "type": "target" @@ -2160,7 +2160,7 @@ "language": "c", "name": "stream_compression_test", "src": [ - "test/core/compression/stream_compression_test.c" + "test/core/compression/stream_compression_test.cc" ], "third_party": false, "type": "target" @@ -2177,7 +2177,7 @@ "language": "c", "name": "stream_owned_slice_test", "src": [ - "test/core/transport/stream_owned_slice_test.c" + "test/core/transport/stream_owned_slice_test.cc" ], "third_party": false, "type": "target" @@ -2194,7 +2194,7 @@ "language": "c", "name": "tcp_client_posix_test", "src": [ - "test/core/iomgr/tcp_client_posix_test.c" + "test/core/iomgr/tcp_client_posix_test.cc" ], "third_party": false, "type": "target" @@ -2211,7 +2211,7 @@ "language": "c", "name": "tcp_client_uv_test", "src": [ - "test/core/iomgr/tcp_client_uv_test.c" + "test/core/iomgr/tcp_client_uv_test.cc" ], "third_party": false, "type": "target" @@ -2228,7 +2228,7 @@ "language": "c", "name": "tcp_posix_test", "src": [ - "test/core/iomgr/tcp_posix_test.c" + "test/core/iomgr/tcp_posix_test.cc" ], "third_party": false, "type": "target" @@ -2245,7 +2245,7 @@ "language": "c", "name": "tcp_server_posix_test", "src": [ - "test/core/iomgr/tcp_server_posix_test.c" + "test/core/iomgr/tcp_server_posix_test.cc" ], "third_party": false, "type": "target" @@ -2262,7 +2262,7 @@ "language": "c", "name": "tcp_server_uv_test", "src": [ - "test/core/iomgr/tcp_server_uv_test.c" + "test/core/iomgr/tcp_server_uv_test.cc" ], "third_party": false, "type": "target" @@ -2279,7 +2279,7 @@ "language": "c", "name": "time_averaged_stats_test", "src": [ - "test/core/iomgr/time_averaged_stats_test.c" + "test/core/iomgr/time_averaged_stats_test.cc" ], "third_party": false, "type": "target" @@ -2296,7 +2296,7 @@ "language": "c", "name": "timeout_encoding_test", "src": [ - "test/core/transport/timeout_encoding_test.c" + "test/core/transport/timeout_encoding_test.cc" ], "third_party": false, "type": "target" @@ -2313,7 +2313,7 @@ "language": "c", "name": "timer_heap_test", "src": [ - "test/core/iomgr/timer_heap_test.c" + "test/core/iomgr/timer_heap_test.cc" ], "third_party": false, "type": "target" @@ -2330,7 +2330,7 @@ "language": "c", "name": "timer_list_test", "src": [ - "test/core/iomgr/timer_list_test.c" + "test/core/iomgr/timer_list_test.cc" ], "third_party": false, "type": "target" @@ -2347,7 +2347,7 @@ "language": "c", "name": "transport_connectivity_state_test", "src": [ - "test/core/transport/connectivity_state_test.c" + "test/core/transport/connectivity_state_test.cc" ], "third_party": false, "type": "target" @@ -2364,7 +2364,7 @@ "language": "c", "name": "transport_metadata_test", "src": [ - "test/core/transport/metadata_test.c" + "test/core/transport/metadata_test.cc" ], "third_party": false, "type": "target" @@ -2381,7 +2381,7 @@ "language": "c", "name": "transport_security_test", "src": [ - "test/core/tsi/transport_security_test.c" + "test/core/tsi/transport_security_test.cc" ], "third_party": false, "type": "target" @@ -2398,7 +2398,7 @@ "language": "c", "name": "udp_server_test", "src": [ - "test/core/iomgr/udp_server_test.c" + "test/core/iomgr/udp_server_test.cc" ], "third_party": false, "type": "target" @@ -2415,7 +2415,7 @@ "language": "c", "name": "uri_fuzzer_test", "src": [ - "test/core/client_channel/uri_fuzzer_test.c" + "test/core/client_channel/uri_fuzzer_test.cc" ], "third_party": false, "type": "target" @@ -2432,7 +2432,7 @@ "language": "c", "name": "uri_parser_test", "src": [ - "test/core/client_channel/uri_parser_test.c" + "test/core/client_channel/uri_parser_test.cc" ], "third_party": false, "type": "target" @@ -2449,7 +2449,7 @@ "language": "c", "name": "wakeup_fd_cv_test", "src": [ - "test/core/iomgr/wakeup_fd_cv_test.c" + "test/core/iomgr/wakeup_fd_cv_test.cc" ], "third_party": false, "type": "target" @@ -4796,7 +4796,7 @@ "language": "c", "name": "badreq_bad_client_test", "src": [ - "test/core/bad_client/tests/badreq.c" + "test/core/bad_client/tests/badreq.cc" ], "third_party": false, "type": "target" @@ -4814,7 +4814,7 @@ "language": "c", "name": "connection_prefix_bad_client_test", "src": [ - "test/core/bad_client/tests/connection_prefix.c" + "test/core/bad_client/tests/connection_prefix.cc" ], "third_party": false, "type": "target" @@ -4832,7 +4832,7 @@ "language": "c", "name": "head_of_line_blocking_bad_client_test", "src": [ - "test/core/bad_client/tests/head_of_line_blocking.c" + "test/core/bad_client/tests/head_of_line_blocking.cc" ], "third_party": false, "type": "target" @@ -4850,7 +4850,7 @@ "language": "c", "name": "headers_bad_client_test", "src": [ - "test/core/bad_client/tests/headers.c" + "test/core/bad_client/tests/headers.cc" ], "third_party": false, "type": "target" @@ -4868,7 +4868,7 @@ "language": "c", "name": "initial_settings_frame_bad_client_test", "src": [ - "test/core/bad_client/tests/initial_settings_frame.c" + "test/core/bad_client/tests/initial_settings_frame.cc" ], "third_party": false, "type": "target" @@ -4886,7 +4886,7 @@ "language": "c", "name": "server_registered_method_bad_client_test", "src": [ - "test/core/bad_client/tests/server_registered_method.c" + "test/core/bad_client/tests/server_registered_method.cc" ], "third_party": false, "type": "target" @@ -4904,7 +4904,7 @@ "language": "c", "name": "simple_request_bad_client_test", "src": [ - "test/core/bad_client/tests/simple_request.c" + "test/core/bad_client/tests/simple_request.cc" ], "third_party": false, "type": "target" @@ -4922,7 +4922,7 @@ "language": "c", "name": "unknown_frame_bad_client_test", "src": [ - "test/core/bad_client/tests/unknown_frame.c" + "test/core/bad_client/tests/unknown_frame.cc" ], "third_party": false, "type": "target" @@ -4940,7 +4940,7 @@ "language": "c", "name": "window_overflow_bad_client_test", "src": [ - "test/core/bad_client/tests/window_overflow.c" + "test/core/bad_client/tests/window_overflow.cc" ], "third_party": false, "type": "target" @@ -4958,7 +4958,7 @@ "language": "c", "name": "bad_ssl_cert_server", "src": [ - "test/core/bad_ssl/servers/cert.c" + "test/core/bad_ssl/servers/cert.cc" ], "third_party": false, "type": "target" @@ -4975,7 +4975,7 @@ "language": "c", "name": "bad_ssl_cert_test", "src": [ - "test/core/bad_ssl/bad_ssl_test.c" + "test/core/bad_ssl/bad_ssl_test.cc" ], "third_party": false, "type": "target" @@ -4993,7 +4993,7 @@ "language": "c", "name": "h2_census_test", "src": [ - "test/core/end2end/fixtures/h2_census.c" + "test/core/end2end/fixtures/h2_census.cc" ], "third_party": false, "type": "target" @@ -5011,7 +5011,7 @@ "language": "c", "name": "h2_compress_test", "src": [ - "test/core/end2end/fixtures/h2_compress.c" + "test/core/end2end/fixtures/h2_compress.cc" ], "third_party": false, "type": "target" @@ -5029,7 +5029,7 @@ "language": "c", "name": "h2_fakesec_test", "src": [ - "test/core/end2end/fixtures/h2_fakesec.c" + "test/core/end2end/fixtures/h2_fakesec.cc" ], "third_party": false, "type": "target" @@ -5047,7 +5047,7 @@ "language": "c", "name": "h2_fd_test", "src": [ - "test/core/end2end/fixtures/h2_fd.c" + "test/core/end2end/fixtures/h2_fd.cc" ], "third_party": false, "type": "target" @@ -5065,7 +5065,7 @@ "language": "c", "name": "h2_full_test", "src": [ - "test/core/end2end/fixtures/h2_full.c" + "test/core/end2end/fixtures/h2_full.cc" ], "third_party": false, "type": "target" @@ -5083,7 +5083,7 @@ "language": "c", "name": "h2_full+pipe_test", "src": [ - "test/core/end2end/fixtures/h2_full+pipe.c" + "test/core/end2end/fixtures/h2_full+pipe.cc" ], "third_party": false, "type": "target" @@ -5101,7 +5101,7 @@ "language": "c", "name": "h2_full+trace_test", "src": [ - "test/core/end2end/fixtures/h2_full+trace.c" + "test/core/end2end/fixtures/h2_full+trace.cc" ], "third_party": false, "type": "target" @@ -5119,7 +5119,7 @@ "language": "c", "name": "h2_full+workarounds_test", "src": [ - "test/core/end2end/fixtures/h2_full+workarounds.c" + "test/core/end2end/fixtures/h2_full+workarounds.cc" ], "third_party": false, "type": "target" @@ -5137,7 +5137,7 @@ "language": "c", "name": "h2_http_proxy_test", "src": [ - "test/core/end2end/fixtures/h2_http_proxy.c" + "test/core/end2end/fixtures/h2_http_proxy.cc" ], "third_party": false, "type": "target" @@ -5155,7 +5155,7 @@ "language": "c", "name": "h2_load_reporting_test", "src": [ - "test/core/end2end/fixtures/h2_load_reporting.c" + "test/core/end2end/fixtures/h2_load_reporting.cc" ], "third_party": false, "type": "target" @@ -5173,7 +5173,7 @@ "language": "c", "name": "h2_oauth2_test", "src": [ - "test/core/end2end/fixtures/h2_oauth2.c" + "test/core/end2end/fixtures/h2_oauth2.cc" ], "third_party": false, "type": "target" @@ -5191,7 +5191,7 @@ "language": "c", "name": "h2_proxy_test", "src": [ - "test/core/end2end/fixtures/h2_proxy.c" + "test/core/end2end/fixtures/h2_proxy.cc" ], "third_party": false, "type": "target" @@ -5209,7 +5209,7 @@ "language": "c", "name": "h2_sockpair_test", "src": [ - "test/core/end2end/fixtures/h2_sockpair.c" + "test/core/end2end/fixtures/h2_sockpair.cc" ], "third_party": false, "type": "target" @@ -5227,7 +5227,7 @@ "language": "c", "name": "h2_sockpair+trace_test", "src": [ - "test/core/end2end/fixtures/h2_sockpair+trace.c" + "test/core/end2end/fixtures/h2_sockpair+trace.cc" ], "third_party": false, "type": "target" @@ -5245,7 +5245,7 @@ "language": "c", "name": "h2_sockpair_1byte_test", "src": [ - "test/core/end2end/fixtures/h2_sockpair_1byte.c" + "test/core/end2end/fixtures/h2_sockpair_1byte.cc" ], "third_party": false, "type": "target" @@ -5263,7 +5263,7 @@ "language": "c", "name": "h2_ssl_test", "src": [ - "test/core/end2end/fixtures/h2_ssl.c" + "test/core/end2end/fixtures/h2_ssl.cc" ], "third_party": false, "type": "target" @@ -5281,7 +5281,7 @@ "language": "c", "name": "h2_ssl_proxy_test", "src": [ - "test/core/end2end/fixtures/h2_ssl_proxy.c" + "test/core/end2end/fixtures/h2_ssl_proxy.cc" ], "third_party": false, "type": "target" @@ -5299,7 +5299,7 @@ "language": "c", "name": "h2_uds_test", "src": [ - "test/core/end2end/fixtures/h2_uds.c" + "test/core/end2end/fixtures/h2_uds.cc" ], "third_party": false, "type": "target" @@ -5317,7 +5317,7 @@ "language": "c", "name": "inproc_test", "src": [ - "test/core/end2end/fixtures/inproc.c" + "test/core/end2end/fixtures/inproc.cc" ], "third_party": false, "type": "target" @@ -5335,7 +5335,7 @@ "language": "c", "name": "h2_census_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_census.c" + "test/core/end2end/fixtures/h2_census.cc" ], "third_party": false, "type": "target" @@ -5353,7 +5353,7 @@ "language": "c", "name": "h2_compress_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_compress.c" + "test/core/end2end/fixtures/h2_compress.cc" ], "third_party": false, "type": "target" @@ -5371,7 +5371,7 @@ "language": "c", "name": "h2_fd_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_fd.c" + "test/core/end2end/fixtures/h2_fd.cc" ], "third_party": false, "type": "target" @@ -5389,7 +5389,7 @@ "language": "c", "name": "h2_full_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_full.c" + "test/core/end2end/fixtures/h2_full.cc" ], "third_party": false, "type": "target" @@ -5407,7 +5407,7 @@ "language": "c", "name": "h2_full+pipe_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_full+pipe.c" + "test/core/end2end/fixtures/h2_full+pipe.cc" ], "third_party": false, "type": "target" @@ -5425,7 +5425,7 @@ "language": "c", "name": "h2_full+trace_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_full+trace.c" + "test/core/end2end/fixtures/h2_full+trace.cc" ], "third_party": false, "type": "target" @@ -5443,7 +5443,7 @@ "language": "c", "name": "h2_full+workarounds_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_full+workarounds.c" + "test/core/end2end/fixtures/h2_full+workarounds.cc" ], "third_party": false, "type": "target" @@ -5461,7 +5461,7 @@ "language": "c", "name": "h2_http_proxy_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_http_proxy.c" + "test/core/end2end/fixtures/h2_http_proxy.cc" ], "third_party": false, "type": "target" @@ -5479,7 +5479,7 @@ "language": "c", "name": "h2_load_reporting_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_load_reporting.c" + "test/core/end2end/fixtures/h2_load_reporting.cc" ], "third_party": false, "type": "target" @@ -5497,7 +5497,7 @@ "language": "c", "name": "h2_proxy_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_proxy.c" + "test/core/end2end/fixtures/h2_proxy.cc" ], "third_party": false, "type": "target" @@ -5515,7 +5515,7 @@ "language": "c", "name": "h2_sockpair_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_sockpair.c" + "test/core/end2end/fixtures/h2_sockpair.cc" ], "third_party": false, "type": "target" @@ -5533,7 +5533,7 @@ "language": "c", "name": "h2_sockpair+trace_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_sockpair+trace.c" + "test/core/end2end/fixtures/h2_sockpair+trace.cc" ], "third_party": false, "type": "target" @@ -5551,7 +5551,7 @@ "language": "c", "name": "h2_sockpair_1byte_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_sockpair_1byte.c" + "test/core/end2end/fixtures/h2_sockpair_1byte.cc" ], "third_party": false, "type": "target" @@ -5569,7 +5569,7 @@ "language": "c", "name": "h2_uds_nosec_test", "src": [ - "test/core/end2end/fixtures/h2_uds.c" + "test/core/end2end/fixtures/h2_uds.cc" ], "third_party": false, "type": "target" @@ -5587,7 +5587,7 @@ "language": "c", "name": "inproc_nosec_test", "src": [ - "test/core/end2end/fixtures/inproc.c" + "test/core/end2end/fixtures/inproc.cc" ], "third_party": false, "type": "target" @@ -5684,8 +5684,8 @@ "language": "c", "name": "api_fuzzer_one_entry", "src": [ - "test/core/end2end/fuzzers/api_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/end2end/fuzzers/api_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5702,8 +5702,8 @@ "language": "c", "name": "client_fuzzer_one_entry", "src": [ - "test/core/end2end/fuzzers/client_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/end2end/fuzzers/client_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5720,8 +5720,8 @@ "language": "c", "name": "hpack_parser_fuzzer_test_one_entry", "src": [ - "test/core/transport/chttp2/hpack_parser_fuzzer_test.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/transport/chttp2/hpack_parser_fuzzer_test.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5738,8 +5738,8 @@ "language": "c", "name": "http_request_fuzzer_test_one_entry", "src": [ - "test/core/http/request_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/http/request_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5756,8 +5756,8 @@ "language": "c", "name": "http_response_fuzzer_test_one_entry", "src": [ - "test/core/http/response_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/http/response_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5774,8 +5774,8 @@ "language": "c", "name": "json_fuzzer_test_one_entry", "src": [ - "test/core/json/fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/json/fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5792,8 +5792,8 @@ "language": "c", "name": "nanopb_fuzzer_response_test_one_entry", "src": [ - "test/core/nanopb/fuzzer_response.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/nanopb/fuzzer_response.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5810,8 +5810,8 @@ "language": "c", "name": "nanopb_fuzzer_serverlist_test_one_entry", "src": [ - "test/core/nanopb/fuzzer_serverlist.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/nanopb/fuzzer_serverlist.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5828,8 +5828,8 @@ "language": "c", "name": "percent_decode_fuzzer_one_entry", "src": [ - "test/core/slice/percent_decode_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/slice/percent_decode_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5846,8 +5846,8 @@ "language": "c", "name": "percent_encode_fuzzer_one_entry", "src": [ - "test/core/slice/percent_encode_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/slice/percent_encode_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5864,8 +5864,8 @@ "language": "c", "name": "server_fuzzer_one_entry", "src": [ - "test/core/end2end/fuzzers/server_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/end2end/fuzzers/server_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5882,8 +5882,8 @@ "language": "c", "name": "ssl_server_fuzzer_one_entry", "src": [ - "test/core/security/ssl_server_fuzzer.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/security/ssl_server_fuzzer.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5900,8 +5900,8 @@ "language": "c", "name": "uri_fuzzer_test_one_entry", "src": [ - "test/core/client_channel/uri_fuzzer_test.c", - "test/core/util/one_corpus_entry_fuzzer.c" + "test/core/client_channel/uri_fuzzer_test.cc", + "test/core/util/one_corpus_entry_fuzzer.cc" ], "third_party": false, "type": "target" @@ -5929,7 +5929,7 @@ "language": "c", "name": "gpr_test_util", "src": [ - "test/core/util/test_config.c", + "test/core/util/test_config.cc", "test/core/util/test_config.h" ], "third_party": false, @@ -6016,12 +6016,12 @@ "language": "c", "name": "grpc_test_util", "src": [ - "test/core/end2end/data/client_certs.c", - "test/core/end2end/data/server1_cert.c", - "test/core/end2end/data/server1_key.c", + "test/core/end2end/data/client_certs.cc", + "test/core/end2end/data/server1_cert.cc", + "test/core/end2end/data/server1_key.cc", "test/core/end2end/data/ssl_test_data.h", - "test/core/end2end/data/test_root_cert.c", - "test/core/security/oauth2_utils.c", + "test/core/end2end/data/test_root_cert.cc", + "test/core/security/oauth2_utils.cc", "test/core/security/oauth2_utils.h" ], "third_party": false, @@ -6090,7 +6090,7 @@ "language": "c", "name": "reconnect_server", "src": [ - "test/core/util/reconnect_server.c", + "test/core/util/reconnect_server.cc", "test/core/util/reconnect_server.h" ], "third_party": false, @@ -6110,7 +6110,7 @@ "language": "c", "name": "test_tcp_server", "src": [ - "test/core/util/test_tcp_server.c", + "test/core/util/test_tcp_server.cc", "test/core/util/test_tcp_server.h" ], "third_party": false, @@ -7467,7 +7467,7 @@ "language": "c", "name": "bad_client_test", "src": [ - "test/core/bad_client/bad_client.c", + "test/core/bad_client/bad_client.cc", "test/core/bad_client/bad_client.h" ], "third_party": false, @@ -7487,7 +7487,7 @@ "language": "c", "name": "bad_ssl_test_server", "src": [ - "test/core/bad_ssl/server_common.c", + "test/core/bad_ssl/server_common.cc", "test/core/bad_ssl/server_common.h" ], "third_party": false, @@ -7508,69 +7508,69 @@ "language": "c", "name": "end2end_tests", "src": [ - "test/core/end2end/end2end_test_utils.c", - "test/core/end2end/end2end_tests.c", + "test/core/end2end/end2end_test_utils.cc", + "test/core/end2end/end2end_tests.cc", "test/core/end2end/end2end_tests.h", - "test/core/end2end/tests/authority_not_supported.c", - "test/core/end2end/tests/bad_hostname.c", - "test/core/end2end/tests/bad_ping.c", - "test/core/end2end/tests/binary_metadata.c", - "test/core/end2end/tests/call_creds.c", - "test/core/end2end/tests/cancel_after_accept.c", - "test/core/end2end/tests/cancel_after_client_done.c", - "test/core/end2end/tests/cancel_after_invoke.c", - "test/core/end2end/tests/cancel_after_round_trip.c", - "test/core/end2end/tests/cancel_before_invoke.c", - "test/core/end2end/tests/cancel_in_a_vacuum.c", + "test/core/end2end/tests/authority_not_supported.cc", + "test/core/end2end/tests/bad_hostname.cc", + "test/core/end2end/tests/bad_ping.cc", + "test/core/end2end/tests/binary_metadata.cc", + "test/core/end2end/tests/call_creds.cc", + "test/core/end2end/tests/cancel_after_accept.cc", + "test/core/end2end/tests/cancel_after_client_done.cc", + "test/core/end2end/tests/cancel_after_invoke.cc", + "test/core/end2end/tests/cancel_after_round_trip.cc", + "test/core/end2end/tests/cancel_before_invoke.cc", + "test/core/end2end/tests/cancel_in_a_vacuum.cc", "test/core/end2end/tests/cancel_test_helpers.h", - "test/core/end2end/tests/cancel_with_status.c", - "test/core/end2end/tests/compressed_payload.c", - "test/core/end2end/tests/connectivity.c", - "test/core/end2end/tests/default_host.c", - "test/core/end2end/tests/disappearing_server.c", - "test/core/end2end/tests/empty_batch.c", - "test/core/end2end/tests/filter_call_init_fails.c", - "test/core/end2end/tests/filter_causes_close.c", - "test/core/end2end/tests/filter_latency.c", - "test/core/end2end/tests/graceful_server_shutdown.c", - "test/core/end2end/tests/high_initial_seqno.c", - "test/core/end2end/tests/hpack_size.c", - "test/core/end2end/tests/idempotent_request.c", - "test/core/end2end/tests/invoke_large_request.c", - "test/core/end2end/tests/keepalive_timeout.c", - "test/core/end2end/tests/large_metadata.c", - "test/core/end2end/tests/load_reporting_hook.c", - "test/core/end2end/tests/max_concurrent_streams.c", - "test/core/end2end/tests/max_connection_age.c", - "test/core/end2end/tests/max_connection_idle.c", - "test/core/end2end/tests/max_message_length.c", - "test/core/end2end/tests/negative_deadline.c", - "test/core/end2end/tests/network_status_change.c", - "test/core/end2end/tests/no_logging.c", - "test/core/end2end/tests/no_op.c", - "test/core/end2end/tests/payload.c", - "test/core/end2end/tests/ping.c", - "test/core/end2end/tests/ping_pong_streaming.c", - "test/core/end2end/tests/proxy_auth.c", - "test/core/end2end/tests/registered_call.c", - "test/core/end2end/tests/request_with_flags.c", - "test/core/end2end/tests/request_with_payload.c", - "test/core/end2end/tests/resource_quota_server.c", - "test/core/end2end/tests/server_finishes_request.c", - "test/core/end2end/tests/shutdown_finishes_calls.c", - "test/core/end2end/tests/shutdown_finishes_tags.c", - "test/core/end2end/tests/simple_cacheable_request.c", - "test/core/end2end/tests/simple_delayed_request.c", - "test/core/end2end/tests/simple_metadata.c", - "test/core/end2end/tests/simple_request.c", - "test/core/end2end/tests/stream_compression_compressed_payload.c", - "test/core/end2end/tests/stream_compression_payload.c", - "test/core/end2end/tests/stream_compression_ping_pong_streaming.c", - "test/core/end2end/tests/streaming_error_response.c", - "test/core/end2end/tests/trailing_metadata.c", - "test/core/end2end/tests/workaround_cronet_compression.c", - "test/core/end2end/tests/write_buffering.c", - "test/core/end2end/tests/write_buffering_at_end.c" + "test/core/end2end/tests/cancel_with_status.cc", + "test/core/end2end/tests/compressed_payload.cc", + "test/core/end2end/tests/connectivity.cc", + "test/core/end2end/tests/default_host.cc", + "test/core/end2end/tests/disappearing_server.cc", + "test/core/end2end/tests/empty_batch.cc", + "test/core/end2end/tests/filter_call_init_fails.cc", + "test/core/end2end/tests/filter_causes_close.cc", + "test/core/end2end/tests/filter_latency.cc", + "test/core/end2end/tests/graceful_server_shutdown.cc", + "test/core/end2end/tests/high_initial_seqno.cc", + "test/core/end2end/tests/hpack_size.cc", + "test/core/end2end/tests/idempotent_request.cc", + "test/core/end2end/tests/invoke_large_request.cc", + "test/core/end2end/tests/keepalive_timeout.cc", + "test/core/end2end/tests/large_metadata.cc", + "test/core/end2end/tests/load_reporting_hook.cc", + "test/core/end2end/tests/max_concurrent_streams.cc", + "test/core/end2end/tests/max_connection_age.cc", + "test/core/end2end/tests/max_connection_idle.cc", + "test/core/end2end/tests/max_message_length.cc", + "test/core/end2end/tests/negative_deadline.cc", + "test/core/end2end/tests/network_status_change.cc", + "test/core/end2end/tests/no_logging.cc", + "test/core/end2end/tests/no_op.cc", + "test/core/end2end/tests/payload.cc", + "test/core/end2end/tests/ping.cc", + "test/core/end2end/tests/ping_pong_streaming.cc", + "test/core/end2end/tests/proxy_auth.cc", + "test/core/end2end/tests/registered_call.cc", + "test/core/end2end/tests/request_with_flags.cc", + "test/core/end2end/tests/request_with_payload.cc", + "test/core/end2end/tests/resource_quota_server.cc", + "test/core/end2end/tests/server_finishes_request.cc", + "test/core/end2end/tests/shutdown_finishes_calls.cc", + "test/core/end2end/tests/shutdown_finishes_tags.cc", + "test/core/end2end/tests/simple_cacheable_request.cc", + "test/core/end2end/tests/simple_delayed_request.cc", + "test/core/end2end/tests/simple_metadata.cc", + "test/core/end2end/tests/simple_request.cc", + "test/core/end2end/tests/stream_compression_compressed_payload.cc", + "test/core/end2end/tests/stream_compression_payload.cc", + "test/core/end2end/tests/stream_compression_ping_pong_streaming.cc", + "test/core/end2end/tests/streaming_error_response.cc", + "test/core/end2end/tests/trailing_metadata.cc", + "test/core/end2end/tests/workaround_cronet_compression.cc", + "test/core/end2end/tests/write_buffering.cc", + "test/core/end2end/tests/write_buffering_at_end.cc" ], "third_party": false, "type": "lib" @@ -7590,68 +7590,68 @@ "language": "c", "name": "end2end_nosec_tests", "src": [ - "test/core/end2end/end2end_nosec_tests.c", - "test/core/end2end/end2end_test_utils.c", + "test/core/end2end/end2end_nosec_tests.cc", + "test/core/end2end/end2end_test_utils.cc", "test/core/end2end/end2end_tests.h", - "test/core/end2end/tests/authority_not_supported.c", - "test/core/end2end/tests/bad_hostname.c", - "test/core/end2end/tests/bad_ping.c", - "test/core/end2end/tests/binary_metadata.c", - "test/core/end2end/tests/cancel_after_accept.c", - "test/core/end2end/tests/cancel_after_client_done.c", - "test/core/end2end/tests/cancel_after_invoke.c", - "test/core/end2end/tests/cancel_after_round_trip.c", - "test/core/end2end/tests/cancel_before_invoke.c", - "test/core/end2end/tests/cancel_in_a_vacuum.c", + "test/core/end2end/tests/authority_not_supported.cc", + "test/core/end2end/tests/bad_hostname.cc", + "test/core/end2end/tests/bad_ping.cc", + "test/core/end2end/tests/binary_metadata.cc", + "test/core/end2end/tests/cancel_after_accept.cc", + "test/core/end2end/tests/cancel_after_client_done.cc", + "test/core/end2end/tests/cancel_after_invoke.cc", + "test/core/end2end/tests/cancel_after_round_trip.cc", + "test/core/end2end/tests/cancel_before_invoke.cc", + "test/core/end2end/tests/cancel_in_a_vacuum.cc", "test/core/end2end/tests/cancel_test_helpers.h", - "test/core/end2end/tests/cancel_with_status.c", - "test/core/end2end/tests/compressed_payload.c", - "test/core/end2end/tests/connectivity.c", - "test/core/end2end/tests/default_host.c", - "test/core/end2end/tests/disappearing_server.c", - "test/core/end2end/tests/empty_batch.c", - "test/core/end2end/tests/filter_call_init_fails.c", - "test/core/end2end/tests/filter_causes_close.c", - "test/core/end2end/tests/filter_latency.c", - "test/core/end2end/tests/graceful_server_shutdown.c", - "test/core/end2end/tests/high_initial_seqno.c", - "test/core/end2end/tests/hpack_size.c", - "test/core/end2end/tests/idempotent_request.c", - "test/core/end2end/tests/invoke_large_request.c", - "test/core/end2end/tests/keepalive_timeout.c", - "test/core/end2end/tests/large_metadata.c", - "test/core/end2end/tests/load_reporting_hook.c", - "test/core/end2end/tests/max_concurrent_streams.c", - "test/core/end2end/tests/max_connection_age.c", - "test/core/end2end/tests/max_connection_idle.c", - "test/core/end2end/tests/max_message_length.c", - "test/core/end2end/tests/negative_deadline.c", - "test/core/end2end/tests/network_status_change.c", - "test/core/end2end/tests/no_logging.c", - "test/core/end2end/tests/no_op.c", - "test/core/end2end/tests/payload.c", - "test/core/end2end/tests/ping.c", - "test/core/end2end/tests/ping_pong_streaming.c", - "test/core/end2end/tests/proxy_auth.c", - "test/core/end2end/tests/registered_call.c", - "test/core/end2end/tests/request_with_flags.c", - "test/core/end2end/tests/request_with_payload.c", - "test/core/end2end/tests/resource_quota_server.c", - "test/core/end2end/tests/server_finishes_request.c", - "test/core/end2end/tests/shutdown_finishes_calls.c", - "test/core/end2end/tests/shutdown_finishes_tags.c", - "test/core/end2end/tests/simple_cacheable_request.c", - "test/core/end2end/tests/simple_delayed_request.c", - "test/core/end2end/tests/simple_metadata.c", - "test/core/end2end/tests/simple_request.c", - "test/core/end2end/tests/stream_compression_compressed_payload.c", - "test/core/end2end/tests/stream_compression_payload.c", - "test/core/end2end/tests/stream_compression_ping_pong_streaming.c", - "test/core/end2end/tests/streaming_error_response.c", - "test/core/end2end/tests/trailing_metadata.c", - "test/core/end2end/tests/workaround_cronet_compression.c", - "test/core/end2end/tests/write_buffering.c", - "test/core/end2end/tests/write_buffering_at_end.c" + "test/core/end2end/tests/cancel_with_status.cc", + "test/core/end2end/tests/compressed_payload.cc", + "test/core/end2end/tests/connectivity.cc", + "test/core/end2end/tests/default_host.cc", + "test/core/end2end/tests/disappearing_server.cc", + "test/core/end2end/tests/empty_batch.cc", + "test/core/end2end/tests/filter_call_init_fails.cc", + "test/core/end2end/tests/filter_causes_close.cc", + "test/core/end2end/tests/filter_latency.cc", + "test/core/end2end/tests/graceful_server_shutdown.cc", + "test/core/end2end/tests/high_initial_seqno.cc", + "test/core/end2end/tests/hpack_size.cc", + "test/core/end2end/tests/idempotent_request.cc", + "test/core/end2end/tests/invoke_large_request.cc", + "test/core/end2end/tests/keepalive_timeout.cc", + "test/core/end2end/tests/large_metadata.cc", + "test/core/end2end/tests/load_reporting_hook.cc", + "test/core/end2end/tests/max_concurrent_streams.cc", + "test/core/end2end/tests/max_connection_age.cc", + "test/core/end2end/tests/max_connection_idle.cc", + "test/core/end2end/tests/max_message_length.cc", + "test/core/end2end/tests/negative_deadline.cc", + "test/core/end2end/tests/network_status_change.cc", + "test/core/end2end/tests/no_logging.cc", + "test/core/end2end/tests/no_op.cc", + "test/core/end2end/tests/payload.cc", + "test/core/end2end/tests/ping.cc", + "test/core/end2end/tests/ping_pong_streaming.cc", + "test/core/end2end/tests/proxy_auth.cc", + "test/core/end2end/tests/registered_call.cc", + "test/core/end2end/tests/request_with_flags.cc", + "test/core/end2end/tests/request_with_payload.cc", + "test/core/end2end/tests/resource_quota_server.cc", + "test/core/end2end/tests/server_finishes_request.cc", + "test/core/end2end/tests/shutdown_finishes_calls.cc", + "test/core/end2end/tests/shutdown_finishes_tags.cc", + "test/core/end2end/tests/simple_cacheable_request.cc", + "test/core/end2end/tests/simple_delayed_request.cc", + "test/core/end2end/tests/simple_metadata.cc", + "test/core/end2end/tests/simple_request.cc", + "test/core/end2end/tests/stream_compression_compressed_payload.cc", + "test/core/end2end/tests/stream_compression_payload.cc", + "test/core/end2end/tests/stream_compression_ping_pong_streaming.cc", + "test/core/end2end/tests/streaming_error_response.cc", + "test/core/end2end/tests/trailing_metadata.cc", + "test/core/end2end/tests/workaround_cronet_compression.cc", + "test/core/end2end/tests/write_buffering.cc", + "test/core/end2end/tests/write_buffering_at_end.cc" ], "third_party": false, "type": "lib" @@ -8863,33 +8863,33 @@ "src": [ "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc", "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h", - "test/core/end2end/cq_verifier.c", + "test/core/end2end/cq_verifier.cc", "test/core/end2end/cq_verifier.h", - "test/core/end2end/fixtures/http_proxy_fixture.c", + "test/core/end2end/fixtures/http_proxy_fixture.cc", "test/core/end2end/fixtures/http_proxy_fixture.h", - "test/core/end2end/fixtures/proxy.c", + "test/core/end2end/fixtures/proxy.cc", "test/core/end2end/fixtures/proxy.h", - "test/core/iomgr/endpoint_tests.c", + "test/core/iomgr/endpoint_tests.cc", "test/core/iomgr/endpoint_tests.h", "test/core/util/debugger_macros.cc", "test/core/util/debugger_macros.h", - "test/core/util/grpc_profiler.c", + "test/core/util/grpc_profiler.cc", "test/core/util/grpc_profiler.h", - "test/core/util/memory_counters.c", + "test/core/util/memory_counters.cc", "test/core/util/memory_counters.h", - "test/core/util/mock_endpoint.c", + "test/core/util/mock_endpoint.cc", "test/core/util/mock_endpoint.h", - "test/core/util/parse_hexstring.c", + "test/core/util/parse_hexstring.cc", "test/core/util/parse_hexstring.h", - "test/core/util/passthru_endpoint.c", + "test/core/util/passthru_endpoint.cc", "test/core/util/passthru_endpoint.h", - "test/core/util/port.c", + "test/core/util/port.cc", "test/core/util/port.h", - "test/core/util/port_server_client.c", + "test/core/util/port_server_client.cc", "test/core/util/port_server_client.h", - "test/core/util/slice_splitter.c", + "test/core/util/slice_splitter.cc", "test/core/util/slice_splitter.h", - "test/core/util/trickle_endpoint.c", + "test/core/util/trickle_endpoint.cc", "test/core/util/trickle_endpoint.h" ], "third_party": false, @@ -9255,7 +9255,7 @@ "language": "c", "name": "transport_security_test_lib", "src": [ - "test/core/tsi/transport_security_test_lib.c", + "test/core/tsi/transport_security_test_lib.cc", "test/core/tsi/transport_security_test_lib.h" ], "third_party": false, diff --git a/tools/run_tests/helper_scripts/build_node.bat b/tools/run_tests/helper_scripts/build_node.bat deleted file mode 100644 index 8986239b04..0000000000 --- a/tools/run_tests/helper_scripts/build_node.bat +++ /dev/null @@ -1,29 +0,0 @@ -@rem Copyright 2016 gRPC authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. - -set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm - -del /f /q BUILD || rmdir build /s /q - -call npm install --build-from-source - -@rem delete the redundant openssl headers -for /f "delims=v" %%v in ('node --version') do ( - rmdir "%USERPROFILE%\.node-gyp\%%v\include\node\openssl" /S /Q -) - - - -@rem rebuild, because it probably failed the first time -call npm install --build-from-source %* diff --git a/tools/run_tests/helper_scripts/build_node.sh b/tools/run_tests/helper_scripts/build_node.sh deleted file mode 100755 index adae4a1e0f..0000000000 --- a/tools/run_tests/helper_scripts/build_node.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -NODE_VERSION=$1 -source ~/.nvm/nvm.sh - -nvm use $NODE_VERSION -set -ex - -CONFIG=${CONFIG:-opt} - -# change to grpc repo root -cd $(dirname $0)/../../.. - -case "$CONFIG" in - 'dbg') config_flags='--debug' ;; - 'gcov') config_flags="--debug --grpc_gcov=true" ;; - *) config_flag='--release' ;; -esac - -npm install --unsafe-perm --build-from-source $config_flag diff --git a/tools/run_tests/helper_scripts/build_node_electron.sh b/tools/run_tests/helper_scripts/build_node_electron.sh deleted file mode 100755 index 424da2c6e3..0000000000 --- a/tools/run_tests/helper_scripts/build_node_electron.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ELECTRON_VERSION=$1 -source ~/.nvm/nvm.sh - -nvm use 8 -set -ex - -# change to grpc repo root -cd $(dirname $0)/../.. - -export npm_config_target=$ELECTRON_VERSION -export npm_config_disturl=https://atom.io/download/atom-shell -export npm_config_runtime=electron -export npm_config_build_from_source=true -mkdir -p ~/.electron-gyp -HOME=~/.electron-gyp npm update --prefer-online -HOME=~/.electron-gyp npm install --unsafe-perm diff --git a/tools/run_tests/helper_scripts/pre_build_node.bat b/tools/run_tests/helper_scripts/pre_build_node.bat deleted file mode 100644 index ececc5755d..0000000000 --- a/tools/run_tests/helper_scripts/pre_build_node.bat +++ /dev/null @@ -1,20 +0,0 @@ -@rem Copyright 2016 gRPC authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. - -set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm - -@rem Update npm to at least version 5 -call npm update -g npm - -call npm update --prefer-online diff --git a/tools/run_tests/helper_scripts/pre_build_node.sh b/tools/run_tests/helper_scripts/pre_build_node.sh deleted file mode 100755 index d4702b8705..0000000000 --- a/tools/run_tests/helper_scripts/pre_build_node.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -NODE_VERSION=$1 -source ~/.nvm/nvm.sh - -nvm install $NODE_VERSION -set -ex - -export GRPC_CONFIG=${CONFIG:-opt} - -npm update --prefer-online - -npm install node-gyp-install -./node_modules/.bin/node-gyp-install diff --git a/tools/run_tests/helper_scripts/pre_build_node_electron.sh b/tools/run_tests/helper_scripts/pre_build_node_electron.sh deleted file mode 100755 index 29394d294f..0000000000 --- a/tools/run_tests/helper_scripts/pre_build_node_electron.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright 2016 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ELECTRON_VERSION=$1 - -nvm install 8 -set -ex - -npm install xvfb-maybe - -npm install electron@$ELECTRON_VERSION diff --git a/tools/run_tests/helper_scripts/run_node.bat b/tools/run_tests/helper_scripts/run_node.bat deleted file mode 100644 index 26f0628a95..0000000000 --- a/tools/run_tests/helper_scripts/run_node.bat +++ /dev/null @@ -1,18 +0,0 @@ -@rem Copyright 2016 gRPC authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. - -set PATH=%PATH%;C:\Program Files\nodejs\;%APPDATA%\npm -set JUNIT_REPORT_PATH=src\node\report.xml -set JUNIT_REPORT_STACK=1 -.\node_modules\.bin\mocha.cmd --reporter mocha-jenkins-reporter --timeout 8000 src\node\test
\ No newline at end of file diff --git a/tools/run_tests/helper_scripts/run_node.sh b/tools/run_tests/helper_scripts/run_node.sh deleted file mode 100755 index 35640047ca..0000000000 --- a/tools/run_tests/helper_scripts/run_node.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -NODE_VERSION=$1 -source ~/.nvm/nvm.sh - -nvm use $NODE_VERSION -set -ex - -CONFIG=${CONFIG:-opt} - -# change to grpc repo root -cd $(dirname $0)/../../.. - -root=`pwd` - -test_directory='src/node/test' -timeout=8000 - -if [ "$CONFIG" = "gcov" ] -then - ./node_modules/.bin/istanbul cover --dir reports/node_coverage \ - -x **/interop/* ./node_modules/.bin/_mocha -- --timeout $timeout $test_directory - cp -r reports/node_coverage/lcov-report/* reports/node_coverage/ - cd build - gcov Release/obj.target/grpc/ext/*.o - lcov --base-directory . --directory . -c -o coverage.info - lcov -e coverage.info '**/src/node/ext/*' -o coverage.info - genhtml -o ../reports/node_ext_coverage --num-spaces 2 \ - -t 'Node gRPC test coverage' coverage.info --rc genhtml_hi_limit=95 \ - --rc genhtml_med_limit=80 --no-prefix -else - JUNIT_REPORT_PATH=src/node/report.xml JUNIT_REPORT_STACK=1 \ - ./node_modules/.bin/mocha --timeout $timeout \ - --reporter mocha-jenkins-reporter $test_directory -fi diff --git a/tools/run_tests/helper_scripts/run_node_electron.sh b/tools/run_tests/helper_scripts/run_node_electron.sh deleted file mode 100755 index 7d436b02cb..0000000000 --- a/tools/run_tests/helper_scripts/run_node_electron.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -source ~/.nvm/nvm.sh - -nvm use 8 -set -ex - -# change to grpc repo root -cd $(dirname $0)/../../.. - -test_directory='src/node/test' -timeout=8000 - -JUNIT_REPORT_PATH=src/node/report.xml JUNIT_REPORT_STACK=1 \ - ./node_modules/.bin/xvfb-maybe \ - ./node_modules/.bin/electron-mocha --timeout $timeout \ - --reporter mocha-jenkins-reporter $test_directory diff --git a/tools/run_tests/performance/kill_workers.sh b/tools/run_tests/performance/kill_workers.sh index dd17eea5f2..efe7282c0a 100755 --- a/tools/run_tests/performance/kill_workers.sh +++ b/tools/run_tests/performance/kill_workers.sh @@ -30,9 +30,6 @@ ps -C dotnet -o pid=,cmd= | grep QpsWorker | awk '{print $1}' | xargs kill -9 || # Ruby ps -C ruby -o pid=,cmd= | grep 'qps/worker.rb' | awk '{print $1}' | xargs kill -9 || true -# Node -ps -C node -o pid=,cmd= | grep 'performance/worker.js' | awk '{print $1}' | xargs kill -9 || true - # Python ps -C python -o pid=,cmd= | grep 'qps_worker.py' | awk '{print $1}' | xargs kill -9 || true diff --git a/tools/run_tests/performance/run_worker_node.sh b/tools/run_tests/performance/run_worker_node.sh deleted file mode 100755 index 1286c831fb..0000000000 --- a/tools/run_tests/performance/run_worker_node.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# Copyright 2015 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -source ~/.nvm/nvm.sh -nvm use 8 - -set -ex - -cd $(dirname $0)/../../.. - -node src/node/performance/worker.js $@ diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py index ddaffa44af..cafac3dfad 100644 --- a/tools/run_tests/performance/scenario_config.py +++ b/tools/run_tests/performance/scenario_config.py @@ -628,86 +628,6 @@ class CSharpLanguage: def __str__(self): return 'csharp' - -class NodeLanguage: - - def __init__(self): - pass - self.safename = str(self) - - def worker_cmdline(self): - return ['tools/run_tests/performance/run_worker_node.sh', - '--benchmark_impl=grpc'] - - def worker_port_offset(self): - return 200 - - def scenarios(self): - # TODO(jtattermusch): make this scenario work - yield _ping_pong_scenario( - 'node_generic_streaming_ping_pong', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_GENERIC_SERVER', - use_generic_payload=True) - - yield _ping_pong_scenario( - 'node_protobuf_streaming_ping_pong', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER') - - yield _ping_pong_scenario( - 'node_protobuf_unary_ping_pong', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - categories=[SCALABLE, SMOKETEST]) - - yield _ping_pong_scenario( - 'cpp_to_node_unary_ping_pong', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - client_language='c++') - - yield _ping_pong_scenario( - 'node_protobuf_unary_ping_pong_1MB', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=1024*1024, resp_size=1024*1024, - categories=[SCALABLE]) - - sizes = [('1B', 1), ('1KB', 1024), ('10KB', 10 * 1024), - ('1MB', 1024 * 1024), ('10MB', 10 * 1024 * 1024), - ('100MB', 100 * 1024 * 1024)] - - for size_name, size in sizes: - for secure in (True, False): - yield _ping_pong_scenario( - 'node_protobuf_unary_ping_pong_%s_resp_%s' % - (size_name, 'secure' if secure else 'insecure'), - rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=0, resp_size=size, - secure=secure, - categories=[SCALABLE]) - - yield _ping_pong_scenario( - 'node_protobuf_unary_qps_unconstrained', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', - categories=[SCALABLE, SMOKETEST]) - - yield _ping_pong_scenario( - 'node_protobuf_streaming_qps_unconstrained', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async') - - yield _ping_pong_scenario( - 'node_to_cpp_protobuf_async_unary_ping_pong', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - server_language='c++', async_server_threads=1) - - yield _ping_pong_scenario( - 'node_to_cpp_protobuf_async_streaming_ping_pong', rpc_type='STREAMING', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - server_language='c++', async_server_threads=1) - - def __str__(self): - return 'node' - class PythonLanguage: def __init__(self): @@ -1018,55 +938,10 @@ class GoLanguage: def __str__(self): return 'go' -class NodeExpressLanguage: - - def __init__(self): - pass - self.safename = str(self) - - def worker_cmdline(self): - return ['tools/run_tests/performance/run_worker_node.sh', - '--benchmark_impl=express'] - - def worker_port_offset(self): - return 700 - - def scenarios(self): - yield _ping_pong_scenario( - 'node_express_json_unary_ping_pong', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - categories=[SCALABLE, SMOKETEST]) - - yield _ping_pong_scenario( - 'node_express_json_async_unary_qps_unconstrained', rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - unconstrained_client='async', - categories=[SCALABLE, SMOKETEST]) - - sizes = [('1B', 1), ('1KB', 1024), ('10KB', 10 * 1024), - ('1MB', 1024 * 1024), ('10MB', 10 * 1024 * 1024), - ('100MB', 100 * 1024 * 1024)] - - for size_name, size in sizes: - for secure in (True, False): - yield _ping_pong_scenario( - 'node_express_json_unary_ping_pong_%s_resp_%s' % - (size_name, 'secure' if secure else 'insecure'), - rpc_type='UNARY', - client_type='ASYNC_CLIENT', server_type='ASYNC_SERVER', - req_size=0, resp_size=size, - secure=secure, - categories=[SCALABLE]) - - def __str__(self): - return 'node_express' - LANGUAGES = { 'c++' : CXXLanguage(), 'csharp' : CSharpLanguage(), - 'node' : NodeLanguage(), - 'node_express': NodeExpressLanguage(), 'ruby' : RubyLanguage(), 'php7' : Php7Language(), 'php7_protobuf_c' : Php7Language(php7_protobuf_c=True), 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 56d6e4e988..e880734651 100644 --- a/tools/run_tests/python_utils/filter_pull_request_tests.py +++ b/tools/run_tests/python_utils/filter_pull_request_tests.py @@ -47,7 +47,7 @@ class TestSuite: _CORE_TEST_SUITE = TestSuite(['c']) _CPP_TEST_SUITE = TestSuite(['c++']) _CSHARP_TEST_SUITE = TestSuite(['csharp']) -_NODE_TEST_SUITE = TestSuite(['node', 'grpc-node']) +_NODE_TEST_SUITE = TestSuite(['grpc-node']) _OBJC_TEST_SUITE = TestSuite(['objc']) _PHP_TEST_SUITE = TestSuite(['php', 'php7']) _PYTHON_TEST_SUITE = TestSuite(['python']) @@ -72,7 +72,6 @@ _WHITELIST_DICT = { '^summerofcode/': [], '^src/cpp/': [_CPP_TEST_SUITE], '^src/csharp/': [_CSHARP_TEST_SUITE], - '^src/node/': [_NODE_TEST_SUITE], '^src/objective\-c/': [_OBJC_TEST_SUITE], '^src/php/': [_PHP_TEST_SUITE], '^src/python/': [_PYTHON_TEST_SUITE], @@ -82,12 +81,10 @@ _WHITELIST_DICT = { '^test/cpp/': [_CPP_TEST_SUITE], '^test/distrib/cpp/': [_CPP_TEST_SUITE], '^test/distrib/csharp/': [_CSHARP_TEST_SUITE], - '^test/distrib/node/': [_NODE_TEST_SUITE], '^test/distrib/php/': [_PHP_TEST_SUITE], '^test/distrib/python/': [_PYTHON_TEST_SUITE], '^test/distrib/ruby/': [_RUBY_TEST_SUITE], '^vsprojects/': [_WINDOWS_TEST_SUITE], - 'binding\.gyp$': [_NODE_TEST_SUITE], 'composer\.json$': [_PHP_TEST_SUITE], 'config\.m4$': [_PHP_TEST_SUITE], 'CONTRIBUTING\.md$': [], diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 209925b5e6..766c1c0b7c 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -536,90 +536,6 @@ class RemoteNodeLanguage(object): return 'grpc-node' -class NodeLanguage(object): - - def __init__(self): - self.platform = platform_string() - - def configure(self, config, args): - self.config = config - self.args = args - # Note: electron ABI only depends on major and minor version, so that's all - # we should specify in the compiler argument - _check_compiler(self.args.compiler, ['default', 'node0.12', - 'node4', 'node5', 'node6', - 'node7', 'node8', - 'electron1.3', 'electron1.6']) - if self.args.compiler == 'default': - self.runtime = 'node' - self.node_version = '8' - else: - if self.args.compiler.startswith('electron'): - self.runtime = 'electron' - self.node_version = self.args.compiler[8:] - else: - self.runtime = 'node' - # Take off the word "node" - self.node_version = self.args.compiler[4:] - - def test_specs(self): - if self.platform == 'windows': - return [self.config.job_spec(['tools\\run_tests\\helper_scripts\\run_node.bat'])] - else: - run_script = 'run_node' - if self.runtime == 'electron': - run_script += '_electron' - return [self.config.job_spec(['tools/run_tests/helper_scripts/{}.sh'.format(run_script), - self.node_version], - None, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)] - - def pre_build_steps(self): - if self.platform == 'windows': - return [['tools\\run_tests\\helper_scripts\\pre_build_node.bat']] - else: - build_script = 'pre_build_node' - if self.runtime == 'electron': - build_script += '_electron' - return [['tools/run_tests/helper_scripts/{}.sh'.format(build_script), - self.node_version]] - - def make_targets(self): - return [] - - def make_options(self): - return [] - - def build_steps(self): - if self.platform == 'windows': - if self.config == 'dbg': - config_flag = '--debug' - else: - config_flag = '--release' - return [['tools\\run_tests\\helper_scripts\\build_node.bat', - config_flag]] - else: - build_script = 'build_node' - if self.runtime == 'electron': - build_script += '_electron' - # building for electron requires a patch version - self.node_version += '.0' - return [['tools/run_tests/helper_scripts/{}.sh'.format(build_script), - self.node_version]] - - def post_tests_steps(self): - return [] - - def makefile_name(self): - return 'Makefile' - - def dockerfile_dir(self): - return 'tools/dockerfile/test/node_jessie_%s' % _docker_arch_suffix(self.args.arch) - - def __str__(self): - return 'node' - - class PhpLanguage(object): def configure(self, config, args): @@ -1103,54 +1019,6 @@ class Sanity(object): def __str__(self): return 'sanity' -class NodeExpressLanguage(object): - """Dummy Node express test target to enable running express performance - benchmarks""" - - def __init__(self): - self.platform = platform_string() - - def configure(self, config, args): - self.config = config - self.args = args - _check_compiler(self.args.compiler, ['default', 'node0.12', - 'node4', 'node5', 'node6']) - if self.args.compiler == 'default': - self.node_version = '4' - else: - # Take off the word "node" - self.node_version = self.args.compiler[4:] - - def test_specs(self): - return [] - - def pre_build_steps(self): - if self.platform == 'windows': - return [['tools\\run_tests\\helper_scripts\\pre_build_node.bat']] - else: - return [['tools/run_tests/helper_scripts/pre_build_node.sh', self.node_version]] - - def make_targets(self): - return [] - - def make_options(self): - return [] - - def build_steps(self): - return [] - - def post_tests_steps(self): - return [] - - def makefile_name(self): - return 'Makefile' - - def dockerfile_dir(self): - return 'tools/dockerfile/test/node_jessie_%s' % _docker_arch_suffix(self.args.arch) - - def __str__(self): - return 'node_express' - # different configurations we can run under with open('tools/run_tests/generated/configs.json') as f: _CONFIGS = dict((cfg['config'], Config(**cfg)) for cfg in ast.literal_eval(f.read())) @@ -1160,8 +1028,6 @@ _LANGUAGES = { 'c++': CLanguage('cxx', 'c++'), 'c': CLanguage('c', 'c'), 'grpc-node': RemoteNodeLanguage(), - 'node': NodeLanguage(), - 'node_express': NodeExpressLanguage(), 'php': PhpLanguage(), 'php7': Php7Language(), 'python': PythonLanguage(), @@ -1311,7 +1177,6 @@ argp.add_argument('--compiler', 'gcc4.4', 'gcc4.6', 'gcc4.8', 'gcc4.9', 'gcc5.3', 'gcc_musl', 'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', 'python2.7', 'python3.4', 'python3.5', 'python3.6', 'pypy', 'pypy3', 'python_alpine', 'all_the_cpythons', - 'node0.12', 'node4', 'node5', 'node6', 'node7', 'node8', 'electron1.3', 'electron1.6', 'coreclr', 'cmake', 'cmake_vs2015', 'cmake_vs2017'], diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py index 34d839e0b8..7c58d8efb1 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -152,8 +152,8 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS): extra_args=extra_args, inner_jobs=inner_jobs, timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - - test_jobs += _generate_jobs(languages=['csharp', 'node', 'python'], + + test_jobs += _generate_jobs(languages=['csharp', 'python'], configs=['dbg', 'opt'], platforms=['linux', 'macos', 'windows'], labels=['basictests', 'multilang'], @@ -168,7 +168,7 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS): extra_args=extra_args, inner_jobs=inner_jobs, timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - + test_jobs += _generate_jobs(languages=['grpc-node', 'ruby', 'php'], configs=['dbg', 'opt'], platforms=['linux', 'macos'], @@ -322,42 +322,6 @@ def _create_portability_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS) inner_jobs=inner_jobs, timeout_seconds=_CPP_RUNTESTS_TIMEOUT) - test_jobs += _generate_jobs(languages=['node'], - configs=['dbg'], - platforms=['linux'], - arch='default', - compiler='electron1.6', - labels=['portability', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['node'], - configs=['dbg'], - platforms=['linux'], - arch='default', - compiler='node4', - labels=['portability', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['node'], - configs=['dbg'], - platforms=['linux'], - arch='default', - compiler='node6', - labels=['portability', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - - test_jobs += _generate_jobs(languages=['node'], - configs=['dbg'], - platforms=['linux'], - arch='default', - compiler='node7', - labels=['portability', 'multilang'], - extra_args=extra_args, - inner_jobs=inner_jobs) - return test_jobs diff --git a/tools/run_tests/sanity/check_test_filtering.py b/tools/run_tests/sanity/check_test_filtering.py index a523f087a1..ff4ecba8ab 100755 --- a/tools/run_tests/sanity/check_test_filtering.py +++ b/tools/run_tests/sanity/check_test_filtering.py @@ -25,7 +25,7 @@ sys.path.insert(0, os.path.abspath('tools/run_tests/')) from run_tests_matrix import _create_test_jobs, _create_portability_test_jobs import python_utils.filter_pull_request_tests as filter_pull_request_tests -_LIST_OF_LANGUAGE_LABELS = ['c', 'c++', 'csharp', 'grpc-node', 'node', 'objc', 'php', 'php7', 'python', 'ruby'] +_LIST_OF_LANGUAGE_LABELS = ['c', 'c++', 'csharp', 'grpc-node', 'objc', 'php', 'php7', 'python', 'ruby'] _LIST_OF_PLATFORM_LABELS = ['linux', 'macos', 'windows'] class TestFilteringTest(unittest.TestCase): @@ -87,8 +87,6 @@ class TestFilteringTest(unittest.TestCase): 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 filter_pull_request_tests._CSHARP_TEST_SUITE.labels]) - self.test_filtering(['src/node/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._NODE_TEST_SUITE.labels]) self.test_filtering(['src/objective-c/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in filter_pull_request_tests._OBJC_TEST_SUITE.labels]) self.test_filtering(['src/php/foo.bar'], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in @@ -103,9 +101,8 @@ class TestFilteringTest(unittest.TestCase): [label for label in _LIST_OF_LANGUAGE_LABELS if label not in filter_pull_request_tests._CPP_TEST_SUITE.labels and label not in filter_pull_request_tests._CORE_TEST_SUITE.labels]) - self.test_filtering(['src/node/foo.bar', 'src/cpp/foo.bar', "src/csharp/foo.bar"], + self.test_filtering(['src/cpp/foo.bar', "src/csharp/foo.bar"], [label for label in _LIST_OF_LANGUAGE_LABELS if label not in - filter_pull_request_tests._NODE_TEST_SUITE.labels and label not in filter_pull_request_tests._CPP_TEST_SUITE.labels and label not in filter_pull_request_tests._CSHARP_TEST_SUITE.labels]) self.test_filtering(['src/objective-c/foo.bar', 'src/php/foo.bar', "src/python/foo.bar", "src/ruby/foo.bar"], |