diff options
Diffstat (limited to 'tools')
54 files changed, 901 insertions, 499 deletions
diff --git a/tools/codegen/core/gen_static_metadata.py b/tools/codegen/core/gen_static_metadata.py index 3a171bbfc2..d4c0052b28 100755 --- a/tools/codegen/core/gen_static_metadata.py +++ b/tools/codegen/core/gen_static_metadata.py @@ -53,6 +53,10 @@ CONFIG = [ 'grpc.max_response_message_bytes', # well known method names '/grpc.lb.v1.LoadBalancer/BalanceLoad', + # compression algorithm names + 'message/deflate', + 'message/gzip', + 'stream/gzip', # metadata elements ('grpc-status', '0'), ('grpc-status', '1'), diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index 0eb2cbe1a2..55cec938c9 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -152,7 +152,9 @@ for filename in filename_list: m = re.search(re_license, text) if m: pass - elif 'DO NOT EDIT' not in text and filename != 'src/boringssl/err_data.c': + elif 'DO NOT EDIT' not in text and filename not in [ + 'src/boringssl/err_data.c', 'src/boringssl/crypto_test_data.cc' + ]: log(1, 'copyright missing', filename) ok = False diff --git a/tools/distrib/python/grpcio_tools/README.rst b/tools/distrib/python/grpcio_tools/README.rst index fb44cfaf80..32873b291f 100644 --- a/tools/distrib/python/grpcio_tools/README.rst +++ b/tools/distrib/python/grpcio_tools/README.rst @@ -61,7 +61,7 @@ GCC-like stuff, but you may end up having a bad time. $ python ../make_grpcio_tools.py # For the next command do `sudo pip install` if you get permission-denied errors - $ pip install . + $ GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install . You cannot currently install Python from source on Windows. Things might work out for you in MSYS2 (follow the Linux instructions), but it isn't officially diff --git a/tools/distrib/run_clang_tidy.py b/tools/distrib/run_clang_tidy.py index bc61d4e79a..337e6b43c8 100755 --- a/tools/distrib/run_clang_tidy.py +++ b/tools/distrib/run_clang_tidy.py @@ -26,6 +26,8 @@ import jobset GRPC_CHECKS = [ 'modernize-use-nullptr', + 'google-build-namespaces', + 'google-build-explicit-make-pair', ] extra_args = [ diff --git a/tools/dockerfile/OWNERS b/tools/dockerfile/OWNERS new file mode 100644 index 0000000000..db4ab546a6 --- /dev/null +++ b/tools/dockerfile/OWNERS @@ -0,0 +1,11 @@ +set noparent + +# These owners are in place to ensure that dockerfiles are changed in a way +# that maximizes use of docker cache when rebuilding and that the docker images +# are fast to build and sane in general. +# Also, push_testing_images.sh needs to be used upon changing the docker images +# for kokoro to be able to access the pre-built images. + +@jtattermusch +@matt-kwong +@nicolasnoble diff --git a/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile index 1d1131f4fa..6f61e17b4a 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux_x64/Dockerfile @@ -22,7 +22,7 @@ RUN yum update -y ############################################################# # Update Git to allow cloning submodules with --reference arg RUN yum remove -y git -RUN yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc +RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc RUN cd /usr/src && \ curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \ tar xzf git-2.0.5.tar.gz diff --git a/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile b/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile index 381c0d0ac6..5c3c35188f 100644 --- a/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile +++ b/tools/dockerfile/grpc_artifact_python_manylinux_x86/Dockerfile @@ -22,7 +22,7 @@ RUN yum update -y ############################################################# # Update Git to allow cloning submodules with --reference arg RUN yum remove -y git -RUN yum install -y curl-devel expat-devel gettext-devel openssl-devel zlib-devel gcc +RUN yum install -y curl-devel expat-devel gettext-devel linux-headers openssl-devel zlib-devel gcc RUN cd /usr/src && \ curl -O -L https://kernel.org/pub/software/scm/git/git-2.0.5.tar.gz && \ tar xzf git-2.0.5.tar.gz diff --git a/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh b/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh index 1a82dd52b7..e1932ed0bf 100755 --- a/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh +++ b/tools/dockerfile/grpc_clang_tidy/clang_tidy_all_the_things.sh @@ -20,5 +20,5 @@ CLANG_TIDY=${CLANG_TIDY:-clang-tidy-5.0} cd ${CLANG_TIDY_ROOT} -find src/core src/cpp test/core test/cpp -name '*.h' -or -name '*.cc' -print0 \ +find src/core src/cpp test/core test/cpp -name '*.h' -print0 -or -name '*.cc' -print0 \ | xargs -0 tools/distrib/run_clang_tidy.py "$@" diff --git a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile index 13a0ea1002..8e5403fdfd 100644 --- a/tools/dockerfile/test/cxx_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/cxx_alpine_x64/Dockerfile @@ -26,6 +26,7 @@ RUN apk update && apk add \ gcc \ git \ libtool \ + linux-headers \ make \ perl \ strace \ diff --git a/tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile b/tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile new file mode 100644 index 0000000000..11aca1766e --- /dev/null +++ b/tools/dockerfile/test/cxx_ubuntu1710_x64/Dockerfile @@ -0,0 +1,88 @@ +# 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. + +FROM ubuntu:17.10 + +# Install Git and basic packages. +RUN apt-get update && apt-get install -y \ + autoconf \ + autotools-dev \ + build-essential \ + bzip2 \ + ccache \ + curl \ + dnsutils \ + gcc \ + gcc-multilib \ + git \ + golang \ + gyp \ + lcov \ + libc6 \ + libc6-dbg \ + libc6-dev \ + libgtest-dev \ + libtool \ + make \ + perl \ + strace \ + python-dev \ + python-setuptools \ + python-yaml \ + telnet \ + unzip \ + wget \ + zip && apt-get clean + +#================ +# Build profiling +RUN apt-get update && apt-get install -y time && apt-get clean + +# Google Cloud platform API libraries +RUN apt-get update && apt-get install -y python-pip && apt-get clean +RUN pip install --upgrade google-api-python-client + +#==================== +# Python dependencies + +# Install dependencies + +RUN apt-get update && apt-get install -y \ + python-all-dev \ + python3-all-dev \ + python-pip + +# 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.5.0.post1 six==1.10.0 twisted==17.5.0 + +#================= +# C++ dependencies +RUN apt-get update && apt-get -y install libgflags-dev libgtest-dev libc++-dev clang && apt-get clean + +# Prepare ccache +RUN ln -s /usr/bin/ccache /usr/local/bin/gcc +RUN ln -s /usr/bin/ccache /usr/local/bin/g++ +RUN ln -s /usr/bin/ccache /usr/local/bin/cc +RUN ln -s /usr/bin/ccache /usr/local/bin/c++ +RUN ln -s /usr/bin/ccache /usr/local/bin/clang +RUN ln -s /usr/bin/ccache /usr/local/bin/clang++ + + +RUN mkdir /var/local/jenkins + + +# Define the default command. +CMD ["bash"] diff --git a/tools/dockerfile/test/python_alpine_x64/Dockerfile b/tools/dockerfile/test/python_alpine_x64/Dockerfile index 87acef9cb6..8ae4550c4f 100644 --- a/tools/dockerfile/test/python_alpine_x64/Dockerfile +++ b/tools/dockerfile/test/python_alpine_x64/Dockerfile @@ -26,6 +26,7 @@ RUN apk update && apk add \ gcc \ git \ libtool \ + linux-headers \ make \ perl \ strace \ diff --git a/tools/doxygen/Doxyfile.c++ b/tools/doxygen/Doxyfile.c++ index f84b4fe2d3..6873256dcd 100644 --- a/tools/doxygen/Doxyfile.c++ +++ b/tools/doxygen/Doxyfile.c++ @@ -875,6 +875,7 @@ include/grpc++/support/time.h \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/compression.h \ +include/grpc/compression_ruby.h \ include/grpc/fork.h \ include/grpc/grpc.h \ include/grpc/grpc_posix.h \ diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal index 1165dc6897..2c6505ddad 100644 --- a/tools/doxygen/Doxyfile.c++.internal +++ b/tools/doxygen/Doxyfile.c++.internal @@ -876,6 +876,7 @@ include/grpc++/support/time.h \ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/compression.h \ +include/grpc/compression_ruby.h \ include/grpc/fork.h \ include/grpc/grpc.h \ include/grpc/grpc_posix.h \ @@ -943,6 +944,7 @@ src/core/lib/channel/handshaker.h \ src/core/lib/channel/handshaker_factory.h \ src/core/lib/channel/handshaker_registry.h \ src/core/lib/compression/algorithm_metadata.h \ +src/core/lib/compression/compression_internal.h \ src/core/lib/compression/message_compress.h \ src/core/lib/compression/stream_compression.h \ src/core/lib/compression/stream_compression_gzip.h \ diff --git a/tools/doxygen/Doxyfile.core b/tools/doxygen/Doxyfile.core index 916d3b1e49..e2ccc78f56 100644 --- a/tools/doxygen/Doxyfile.core +++ b/tools/doxygen/Doxyfile.core @@ -801,6 +801,7 @@ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ include/grpc/compression.h \ +include/grpc/compression_ruby.h \ include/grpc/fork.h \ include/grpc/grpc.h \ include/grpc/grpc_posix.h \ diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal index f3e624ba72..365c80cde9 100644 --- a/tools/doxygen/Doxyfile.core.internal +++ b/tools/doxygen/Doxyfile.core.internal @@ -801,6 +801,7 @@ include/grpc/byte_buffer.h \ include/grpc/byte_buffer_reader.h \ include/grpc/census.h \ include/grpc/compression.h \ +include/grpc/compression_ruby.h \ include/grpc/fork.h \ include/grpc/grpc.h \ include/grpc/grpc_posix.h \ @@ -1050,6 +1051,9 @@ src/core/lib/channel/handshaker_registry.cc \ src/core/lib/channel/handshaker_registry.h \ src/core/lib/compression/algorithm_metadata.h \ src/core/lib/compression/compression.cc \ +src/core/lib/compression/compression_internal.cc \ +src/core/lib/compression/compression_internal.h \ +src/core/lib/compression/compression_ruby.cc \ src/core/lib/compression/message_compress.cc \ src/core/lib/compression/message_compress.h \ src/core/lib/compression/stream_compression.cc \ @@ -1403,10 +1407,10 @@ src/core/lib/transport/transport_impl.h \ src/core/lib/transport/transport_op_string.cc \ src/core/plugin_registry/grpc_plugin_registry.cc \ src/core/tsi/README.md \ +src/core/tsi/alts_transport_security.cc \ +src/core/tsi/alts_transport_security.h \ src/core/tsi/fake_transport_security.cc \ src/core/tsi/fake_transport_security.h \ -src/core/tsi/gts_transport_security.cc \ -src/core/tsi/gts_transport_security.h \ src/core/tsi/ssl_transport_security.cc \ src/core/tsi/ssl_transport_security.h \ src/core/tsi/ssl_types.h \ diff --git a/tools/gce/create_linux_kokoro_performance_worker.sh b/tools/gce/create_linux_kokoro_performance_worker.sh index 0fdb43cf16..a25cc5b6a3 100755 --- a/tools/gce/create_linux_kokoro_performance_worker.sh +++ b/tools/gce/create_linux_kokoro_performance_worker.sh @@ -30,7 +30,7 @@ gcloud compute instances create $INSTANCE_NAME \ --zone "$ZONE" \ --machine-type $MACHINE_TYPE \ --image-project ubuntu-os-cloud \ - --image-family ubuntu-1704 \ + --image-family ubuntu-1710 \ --boot-disk-size 300 \ --scopes https://www.googleapis.com/auth/bigquery \ --tags=allow-ssh diff --git a/tools/gce/create_linux_performance_worker.sh b/tools/gce/create_linux_performance_worker.sh index 4270f5cbfb..e3bc1d577d 100755 --- a/tools/gce/create_linux_performance_worker.sh +++ b/tools/gce/create_linux_performance_worker.sh @@ -34,7 +34,7 @@ gcloud compute instances create $INSTANCE_NAME \ --zone "$ZONE" \ --machine-type $MACHINE_TYPE \ --image-project ubuntu-os-cloud \ - --image-family ubuntu-1704 \ + --image-family ubuntu-1710 \ --boot-disk-size 300 \ --scopes https://www.googleapis.com/auth/bigquery \ --tags=allow-ssh diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index bd8c8eb032..3a09701a30 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -50,7 +50,11 @@ fi set +ex # rvm script is very verbose and exits with errorcode source $HOME/.rvm/scripts/rvm set -e # rvm commands are very verbose -rvm use ruby-2.4 +time rvm install 2.5.0 +rvm use 2.5.0 --default +gem install bundler --no-ri --no-doc +gem install cocoapods --version 1.3.1 --no-ri --no-doc +gem install rake-compiler --no-ri --no-doc rvm osx-ssl-certs status all rvm osx-ssl-certs update all set -ex diff --git a/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh b/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh index a76721881f..c190298282 100644 --- a/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh +++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_dbg.sh @@ -34,10 +34,11 @@ cd $(dirname $0)/../../.. source tools/internal_ci/helper_scripts/prepare_build_linux_rc +# TODO(adelez): implement size for test targets and change test_timeout back "${KOKORO_GFILE_DIR}/bazel_wrapper.py" \ - --host_jvm_args=-Dbazel.DigestFunction=SHA1 \ + --host_jvm_args=-Dbazel.DigestFunction=SHA256 \ test --jobs="50" \ - --test_timeout="300,450,1200,3600" \ + --test_timeout="1200,1200,1200,3600" \ --test_output=errors \ --verbose_failures=true \ --keep_going \ @@ -49,7 +50,7 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc --strategy=Closure=remote \ --genrule_strategy=remote \ --experimental_strict_action_env=true \ - --experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:aa20628a902f06a11a015caa94b0432eb60690de2d2525bd046b9eea046f5d8a" }' \ + --experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:496193842f61c9494be68bd624e47c74d706cabf19a693c4653ffe96a97e43e3" }' \ --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain \ --define GRPC_PORT_ISOLATED_RUNTIME=1 \ -c dbg \ diff --git a/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh b/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh index defe664807..a8c5db4ab1 100644 --- a/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh +++ b/tools/internal_ci/linux/grpc_bazel_on_foundry_opt.sh @@ -34,10 +34,11 @@ cd $(dirname $0)/../../.. source tools/internal_ci/helper_scripts/prepare_build_linux_rc +# TODO(adelez): implement size for test targets and change test_timeout back "${KOKORO_GFILE_DIR}/bazel_wrapper.py" \ - --host_jvm_args=-Dbazel.DigestFunction=SHA1 \ + --host_jvm_args=-Dbazel.DigestFunction=SHA256 \ test --jobs="50" \ - --test_timeout="300,450,1200,3600" \ + --test_timeout="1200,1200,1200,3600" \ --test_output=errors \ --verbose_failures=true \ --keep_going \ @@ -49,7 +50,7 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc --strategy=Closure=remote \ --genrule_strategy=remote \ --experimental_strict_action_env=true \ - --experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:aa20628a902f06a11a015caa94b0432eb60690de2d2525bd046b9eea046f5d8a" }' \ + --experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:496193842f61c9494be68bd624e47c74d706cabf19a693c4653ffe96a97e43e3" }' \ --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain \ --define GRPC_PORT_ISOLATED_RUNTIME=1 \ -c opt \ diff --git a/tools/internal_ci/linux/grpc_tsan_on_foundry.sh b/tools/internal_ci/linux/grpc_tsan_on_foundry.sh new file mode 100644 index 0000000000..7da537ce49 --- /dev/null +++ b/tools/internal_ci/linux/grpc_tsan_on_foundry.sh @@ -0,0 +1,61 @@ +#!/usr/bin/env bash +# Copyright 2017 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. + +set -ex + +# A temporary solution to give Kokoro credentials. +# The file name 4321_grpc-testing-service needs to match auth_credential in +# the build config. +# TODO: Use keystore. +mkdir -p ${KOKORO_KEYSTORE_DIR} +cp ${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json ${KOKORO_KEYSTORE_DIR}/4321_grpc-testing-service + +mkdir -p /tmpfs/tmp/bazel-canary +ln -f "${KOKORO_GFILE_DIR}/bazel-canary" /tmpfs/tmp/bazel-canary/bazel +chmod 755 "${KOKORO_GFILE_DIR}/bazel-canary" +export PATH="/tmpfs/tmp/bazel-canary:${PATH}" +# This should show /tmpfs/tmp/bazel-canary/bazel +which bazel +chmod +x "${KOKORO_GFILE_DIR}/bazel_wrapper.py" + +# change to grpc repo root +cd $(dirname $0)/../../.. + +source tools/internal_ci/helper_scripts/prepare_build_linux_rc + +"${KOKORO_GFILE_DIR}/bazel_wrapper.py" \ + --host_jvm_args=-Dbazel.DigestFunction=SHA256 \ + test --jobs="50" \ + --test_timeout="1500,1500,1500,3600" \ + --test_output=errors \ + --verbose_failures=true \ + --keep_going \ + --remote_accept_cached=true \ + --spawn_strategy=remote \ + --remote_local_fallback=false \ + --remote_timeout=3600 \ + --strategy=Javac=remote \ + --strategy=Closure=remote \ + --genrule_strategy=remote \ + --experimental_strict_action_env=true \ + --experimental_remote_platform_override='properties:{name:"container-image" value:"docker://gcr.io/asci-toolchain/nosla-debian8-clang-fl@sha256:496193842f61c9494be68bd624e47c74d706cabf19a693c4653ffe96a97e43e3" }' \ + --crosstool_top=@com_github_bazelbuild_bazeltoolchains//configs/debian8_clang/0.2.0/bazel_0.7.0:toolchain \ + --define GRPC_PORT_ISOLATED_RUNTIME=1 \ + --copt=-gmlt \ + --strip=never \ + --copt=-fsanitize=thread \ + --linkopt=-fsanitize=thread \ + --test_verbose_timeout_warnings \ + -- //test/... diff --git a/tools/lsan_suppressions.txt b/tools/lsan_suppressions.txt index 6639903ace..204ddbef5e 100644 --- a/tools/lsan_suppressions.txt +++ b/tools/lsan_suppressions.txt @@ -3,3 +3,4 @@ leak:CRYPTO_set_thread_local leak:err_get_state leak:ERR_add_error_dataf leak:err_add_error_vdata +leak:RAND_bytes_with_additional_data diff --git a/tools/profiling/latency_profile/profile_analyzer.py b/tools/profiling/latency_profile/profile_analyzer.py index e3d33574c2..d4d14ef8c7 100755 --- a/tools/profiling/latency_profile/profile_analyzer.py +++ b/tools/profiling/latency_profile/profile_analyzer.py @@ -122,7 +122,8 @@ class CallStackBuilder(object): return True return False elif line_type == '.' or line_type == '!': - self.stk[-1].mark(line) + if self.stk: + self.stk[-1].mark(line) return False else: raise Exception('Unknown line type: \'%s\'' % line_type) @@ -255,6 +256,7 @@ if args.fmt == 'html': accounted_for = 0 for cs in call_stacks: + print >> out, '\n' if args.fmt in BANNER: print >> out, BANNER[args.fmt] % { 'count': cs.count, diff --git a/tools/run_tests/dockerize/build_and_run_docker.sh b/tools/run_tests/dockerize/build_and_run_docker.sh index 323c2f78af..b8f0a55025 100755 --- a/tools/run_tests/dockerize/build_and_run_docker.sh +++ b/tools/run_tests/dockerize/build_and_run_docker.sh @@ -18,7 +18,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." git_root=$(pwd) cd - @@ -31,36 +31,38 @@ cd - # $@ - Extra args to pass to docker run # Use image name based on Dockerfile location checksum -DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ ) +DOCKER_IMAGE_NAME=$(basename "$DOCKERFILE_DIR")_$(sha1sum "$DOCKERFILE_DIR/Dockerfile" | cut -f1 -d\ ) # Pull the base image to force an update if [ "$DOCKER_BASE_IMAGE" != "" ] then - time docker pull $DOCKER_BASE_IMAGE + time docker pull "$DOCKER_BASE_IMAGE" fi if [ "$DOCKERHUB_ORGANIZATION" != "" ] then DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME - time docker pull $DOCKER_IMAGE_NAME + time docker pull "$DOCKER_IMAGE_NAME" else # Make sure docker image has been built. Should be instantaneous if so. - docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR + docker build -t "$DOCKER_IMAGE_NAME" "$DOCKERFILE_DIR" fi # Choose random name for docker container CONTAINER_NAME="build_and_run_docker_$(uuidgen)" # Run command inside docker +# TODO: use a proper array instead of $EXTRA_DOCKER_ARGS +# shellcheck disable=SC2086 docker run \ "$@" \ -e EXTERNAL_GIT_ROOT="/var/local/jenkins/grpc" \ -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ -v "$git_root:/var/local/jenkins/grpc:ro" \ -w /var/local/git/grpc \ - --name=$CONTAINER_NAME \ + --name="$CONTAINER_NAME" \ $EXTRA_DOCKER_ARGS \ - $DOCKER_IMAGE_NAME \ + "$DOCKER_IMAGE_NAME" \ /bin/bash -l "/var/local/jenkins/grpc/$DOCKER_RUN_SCRIPT" || FAILED="true" # Copy output artifacts @@ -70,7 +72,7 @@ then fi # remove the container, possibly killing it first -docker rm -f $CONTAINER_NAME || true +docker rm -f "$CONTAINER_NAME" || true if [ "$FAILED" != "" ] then diff --git a/tools/run_tests/dockerize/build_docker_and_run_tests.sh b/tools/run_tests/dockerize/build_docker_and_run_tests.sh index 32de3fa977..8dca05ea35 100755 --- a/tools/run_tests/dockerize/build_docker_and_run_tests.sh +++ b/tools/run_tests/dockerize/build_docker_and_run_tests.sh @@ -18,7 +18,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." git_root=$(pwd) cd - @@ -35,15 +35,15 @@ mkdir -p /tmp/xdg-cache-home # DOCKERHUB_ORGANIZATION - If set, pull a prebuilt image from given dockerhub org. # Use image name based on Dockerfile location checksum -DOCKER_IMAGE_NAME=$(basename $DOCKERFILE_DIR)_$(sha1sum $DOCKERFILE_DIR/Dockerfile | cut -f1 -d\ ) +DOCKER_IMAGE_NAME=$(basename "$DOCKERFILE_DIR")_$(sha1sum "$DOCKERFILE_DIR/Dockerfile" | cut -f1 -d\ ) if [ "$DOCKERHUB_ORGANIZATION" != "" ] then DOCKER_IMAGE_NAME=$DOCKERHUB_ORGANIZATION/$DOCKER_IMAGE_NAME - time docker pull $DOCKER_IMAGE_NAME + time docker pull "$DOCKER_IMAGE_NAME" else # Make sure docker image has been built. Should be instantaneous if so. - docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR + docker build -t "$DOCKER_IMAGE_NAME" "$DOCKERFILE_DIR" fi # Choose random name for docker container @@ -54,6 +54,8 @@ docker_instance_git_root=/var/local/jenkins/grpc # Run tests inside docker DOCKER_EXIT_CODE=0 +# TODO: silence complaint about $TTY_FLAG expansion in some other way +# shellcheck disable=SC2086 docker run \ -e "RUN_TESTS_COMMAND=$RUN_TESTS_COMMAND" \ -e "config=$config" \ @@ -61,7 +63,7 @@ docker run \ -e CCACHE_DIR=/tmp/ccache \ -e XDG_CACHE_HOME=/tmp/xdg-cache-home \ -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ - -e HOST_GIT_ROOT=$git_root \ + -e HOST_GIT_ROOT="$git_root" \ -e LOCAL_GIT_ROOT=$docker_instance_git_root \ -e "BUILD_ID=$BUILD_ID" \ -e "BUILD_URL=$BUILD_URL" \ @@ -70,7 +72,8 @@ docker run \ -e "KOKORO_BUILD_NUMBER=$KOKORO_BUILD_NUMBER" \ -e "KOKORO_BUILD_URL=$KOKORO_BUILD_URL" \ -e "KOKORO_JOB_NAME=$KOKORO_JOB_NAME" \ - -i $TTY_FLAG \ + -i \ + $TTY_FLAG \ --sysctl net.ipv6.conf.all.disable_ipv6=0 \ -v ~/.config/gcloud:/root/.config/gcloud \ -v "$git_root:$docker_instance_git_root" \ @@ -78,18 +81,18 @@ docker run \ -v /tmp/npm-cache:/tmp/npm-cache \ -v /tmp/xdg-cache-home:/tmp/xdg-cache-home \ -w /var/local/git/grpc \ - --name=$CONTAINER_NAME \ - $DOCKER_IMAGE_NAME \ + --name="$CONTAINER_NAME" \ + "$DOCKER_IMAGE_NAME" \ bash -l "/var/local/jenkins/grpc/$DOCKER_RUN_SCRIPT" || DOCKER_EXIT_CODE=$? # use unique name for reports.zip to prevent clash between concurrent # run_tests.py runs -TEMP_REPORTS_ZIP=`mktemp` -docker cp "$CONTAINER_NAME:/var/local/git/grpc/reports.zip" ${TEMP_REPORTS_ZIP} || true -unzip -o ${TEMP_REPORTS_ZIP} -d $git_root || true -rm -f ${TEMP_REPORTS_ZIP} +TEMP_REPORTS_ZIP=$(mktemp) +docker cp "$CONTAINER_NAME:/var/local/git/grpc/reports.zip" "${TEMP_REPORTS_ZIP}" || true +unzip -o "${TEMP_REPORTS_ZIP}" -d "$git_root" || true +rm -f "${TEMP_REPORTS_ZIP}" # remove the container, possibly killing it first -docker rm -f $CONTAINER_NAME || true +docker rm -f "$CONTAINER_NAME" || true exit $DOCKER_EXIT_CODE diff --git a/tools/run_tests/dockerize/build_interop_image.sh b/tools/run_tests/dockerize/build_interop_image.sh index dbc6bdeea5..90605d9463 100755 --- a/tools/run_tests/dockerize/build_interop_image.sh +++ b/tools/run_tests/dockerize/build_interop_image.sh @@ -28,7 +28,7 @@ set -x # GRPC_GO_ROOT - grpc-go base directory, default to '$GRPC_ROOT/../grpc-go' # GRPC_JAVA_ROOT - grpc-java base directory, default to '$GRPC_ROOT/../grpc-java' -cd `dirname $0`/../../.. +cd "$(dirname "$0")/../../.." echo "GRPC_ROOT: ${GRPC_ROOT:=$(pwd)}" MOUNT_ARGS="-v $GRPC_ROOT:/var/local/jenkins/grpc:ro" @@ -61,7 +61,7 @@ mkdir -p /tmp/ccache # Mount service account dir if available. # If service_directory does not contain the service account JSON file, # some of the tests will fail. -if [ -e $HOME/service_account ] +if [ -e "$HOME/service_account" ] then MOUNT_ARGS+=" -v $HOME/service_account:/var/local/jenkins/service_account:ro" fi @@ -70,18 +70,18 @@ fi # on OSX use md5 instead of sha1sum if which sha1sum > /dev/null; then - BASE_IMAGE=${BASE_NAME}_`sha1sum tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ ` + BASE_IMAGE=${BASE_NAME}_$(sha1sum "tools/dockerfile/interoptest/$BASE_NAME/Dockerfile" | cut -f1 -d\ ) else - BASE_IMAGE=${BASE_NAME}_`md5 -r tools/dockerfile/interoptest/$BASE_NAME/Dockerfile | cut -f1 -d\ ` + BASE_IMAGE=${BASE_NAME}_$(md5 -r "tools/dockerfile/interoptest/$BASE_NAME/Dockerfile" | cut -f1 -d\ ) fi if [ "$DOCKERHUB_ORGANIZATION" != "" ] then BASE_IMAGE=$DOCKERHUB_ORGANIZATION/$BASE_IMAGE - time docker pull $BASE_IMAGE + time docker pull "$BASE_IMAGE" else # Make sure docker image has been built. Should be instantaneous if so. - docker build -t $BASE_IMAGE --force-rm=true tools/dockerfile/interoptest/$BASE_NAME || exit $? + docker build -t "$BASE_IMAGE" --force-rm=true "tools/dockerfile/interoptest/$BASE_NAME" || exit $? fi # Create a local branch so the child Docker script won't complain @@ -90,22 +90,28 @@ git branch -f jenkins-docker CONTAINER_NAME="build_${BASE_NAME}_$(uuidgen)" # Prepare image for interop tests, commit it on success. +# TODO: Figure out if is safe to eliminate the suppression. It's currently here +# because $MOUNT_ARGS and $BUILD_INTEROP_DOCKER_EXTRA_ARGS can have legitimate +# spaces, but the "correct" way to do this is to utilize proper arrays. +# Same for $TTY_FLAG +# shellcheck disable=SC2086 (docker run \ -e CCACHE_DIR=/tmp/ccache \ -e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \ -e THIS_IS_REALLY_NEEDED_ONCE_AGAIN='For issue 4835. See https://github.com/docker/docker/issues/14203 for why docker is awful' \ - -i $TTY_FLAG \ + -i \ + $TTY_FLAG \ $MOUNT_ARGS \ $BUILD_INTEROP_DOCKER_EXTRA_ARGS \ -v /tmp/ccache:/tmp/ccache \ - --name=$CONTAINER_NAME \ - $BASE_IMAGE \ - bash -l /var/local/jenkins/grpc/tools/dockerfile/interoptest/$BASE_NAME/build_interop.sh \ - && docker commit $CONTAINER_NAME $INTEROP_IMAGE \ + --name="$CONTAINER_NAME" \ + "$BASE_IMAGE" \ + bash -l "/var/local/jenkins/grpc/tools/dockerfile/interoptest/$BASE_NAME/build_interop.sh" \ + && docker commit "$CONTAINER_NAME" "$INTEROP_IMAGE" \ && echo "Successfully built image $INTEROP_IMAGE") EXITCODE=$? # remove intermediate container, possibly killing it first -docker rm -f $CONTAINER_NAME +docker rm -f "$CONTAINER_NAME" exit $EXITCODE diff --git a/tools/run_tests/dockerize/docker_run.sh b/tools/run_tests/dockerize/docker_run.sh index 992e4f25b7..ac0d09c28b 100755 --- a/tools/run_tests/dockerize/docker_run.sh +++ b/tools/run_tests/dockerize/docker_run.sh @@ -21,9 +21,11 @@ set -ex if [ "$RELATIVE_COPY_PATH" == "" ] then mkdir -p /var/local/git - git clone $EXTERNAL_GIT_ROOT /var/local/git/grpc + git clone "$EXTERNAL_GIT_ROOT" /var/local/git/grpc # clone gRPC submodules, use data from locally cloned submodules where possible - (cd ${EXTERNAL_GIT_ROOT} && git submodule foreach 'cd /var/local/git/grpc \ + # TODO: figure out a way to eliminate this following shellcheck suppressions + # shellcheck disable=SC2016,SC1004 + (cd "${EXTERNAL_GIT_ROOT}" && git submodule foreach 'cd /var/local/git/grpc \ && git submodule update --init --reference ${EXTERNAL_GIT_ROOT}/${name} \ ${name}') else diff --git a/tools/run_tests/dockerize/docker_run_tests.sh b/tools/run_tests/dockerize/docker_run_tests.sh index 15d703962c..df9d3d1ca2 100755 --- a/tools/run_tests/dockerize/docker_run_tests.sh +++ b/tools/run_tests/dockerize/docker_run_tests.sh @@ -24,11 +24,13 @@ export PATH=$PATH:/usr/bin/llvm-symbolizer # Ensure that programs depending on current-user-ownership of cache directories # are satisfied (it's being mounted from outside the image). -chown $(whoami) $XDG_CACHE_HOME +chown "$(whoami)" "$XDG_CACHE_HOME" mkdir -p /var/local/git git clone /var/local/jenkins/grpc /var/local/git/grpc # clone gRPC submodules, use data from locally cloned submodules where possible +# TODO: figure out a way to eliminate this shellcheck suppression: +# shellcheck disable=SC2016,SC1004 (cd /var/local/jenkins/grpc/ && git submodule foreach 'cd /var/local/git/grpc \ && git submodule update --init --reference /var/local/jenkins/grpc/${name} \ ${name}') @@ -52,8 +54,8 @@ echo '</body></html>' >> index.html cd .. zip -r reports.zip reports -find . -name report.xml | xargs -r zip reports.zip -find . -name sponge_log.xml | xargs -r zip reports.zip -find . -name 'report_*.xml' | xargs -r zip reports.zip +find . -name report.xml -print0 | xargs -0 -r zip reports.zip +find . -name sponge_log.xml -print0 | xargs -0 -r zip reports.zip +find . -name 'report_*.xml' -print0 | xargs -0 -r zip reports.zip exit $exit_code diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json index 362effd7d2..40142c02fd 100644 --- a/tools/run_tests/generated/sources_and_headers.json +++ b/tools/run_tests/generated/sources_and_headers.json @@ -4122,6 +4122,25 @@ "deps": [ "gpr", "gpr_test_util", + "grpc", + "grpc++", + "grpc++_test_util", + "grpc_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "server_early_return_test", + "src": [ + "test/cpp/end2end/server_early_return_test.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "gpr", + "gpr_test_util", "grpc++_test_util_unsecure", "grpc++_unsecure", "grpc_test_util_unsecure", @@ -4395,13 +4414,13 @@ { "deps": [ "boringssl", - "boringssl_aes_test_lib", + "boringssl_crypto_test_data_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_aes_test", + "name": "boringssl_crypto_test_data", "src": [], "third_party": true, "type": "target" @@ -4451,13 +4470,13 @@ { "deps": [ "boringssl", - "boringssl_bn_test_lib", + "boringssl_bytestring_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_bn_test", + "name": "boringssl_bytestring_test", "src": [], "third_party": true, "type": "target" @@ -4465,13 +4484,13 @@ { "deps": [ "boringssl", - "boringssl_bytestring_test_lib", + "boringssl_chacha_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_bytestring_test", + "name": "boringssl_chacha_test", "src": [], "third_party": true, "type": "target" @@ -4521,6 +4540,20 @@ { "deps": [ "boringssl", + "boringssl_compiler_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_compiler_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", "boringssl_constant_time_test_lib", "boringssl_test_util" ], @@ -4577,13 +4610,13 @@ { "deps": [ "boringssl", - "boringssl_digest_test_lib", + "boringssl_dh_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_digest_test", + "name": "boringssl_dh_test", "src": [], "third_party": true, "type": "target" @@ -4591,13 +4624,13 @@ { "deps": [ "boringssl", - "boringssl_example_mul_lib", + "boringssl_digest_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_example_mul", + "name": "boringssl_digest_test", "src": [], "third_party": true, "type": "target" @@ -4605,13 +4638,13 @@ { "deps": [ "boringssl", - "boringssl_p256-x86_64_test_lib", + "boringssl_dsa_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_p256-x86_64_test", + "name": "boringssl_dsa_test", "src": [], "third_party": true, "type": "target" @@ -4633,13 +4666,13 @@ { "deps": [ "boringssl", - "boringssl_ecdsa_sign_test_lib", + "boringssl_err_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_ecdsa_sign_test", + "name": "boringssl_err_test", "src": [], "third_party": true, "type": "target" @@ -4647,13 +4680,27 @@ { "deps": [ "boringssl", - "boringssl_ecdsa_test_lib", + "boringssl_evp_extra_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_ecdsa_test", + "name": "boringssl_evp_extra_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_evp_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_evp_test", "src": [], "third_party": true, "type": "target" @@ -4661,13 +4708,13 @@ { "deps": [ "boringssl", - "boringssl_ecdsa_verify_test_lib", + "boringssl_pbkdf_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_ecdsa_verify_test", + "name": "boringssl_pbkdf_test", "src": [], "third_party": true, "type": "target" @@ -4675,13 +4722,13 @@ { "deps": [ "boringssl", - "boringssl_evp_extra_test_lib", + "boringssl_scrypt_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_evp_extra_test", + "name": "boringssl_scrypt_test", "src": [], "third_party": true, "type": "target" @@ -4689,13 +4736,13 @@ { "deps": [ "boringssl", - "boringssl_evp_test_lib", + "boringssl_aes_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_evp_test", + "name": "boringssl_aes_test", "src": [], "third_party": true, "type": "target" @@ -4703,13 +4750,83 @@ { "deps": [ "boringssl", - "boringssl_pbkdf_test_lib", + "boringssl_bn_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_pbkdf_test", + "name": "boringssl_bn_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_ec_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ec_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_p256-x86_64_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_p256-x86_64_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_ecdsa_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ecdsa_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_gcm_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_gcm_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_ctrdrbg_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ctrdrbg_test", "src": [], "third_party": true, "type": "target" @@ -4759,13 +4876,13 @@ { "deps": [ "boringssl", - "boringssl_gcm_test_lib", + "boringssl_obj_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_gcm_test", + "name": "boringssl_obj_test", "src": [], "third_party": true, "type": "target" @@ -4773,13 +4890,13 @@ { "deps": [ "boringssl", - "boringssl_obj_test_lib", + "boringssl_pkcs7_test_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_obj_test", + "name": "boringssl_pkcs7_test", "src": [], "third_party": true, "type": "target" @@ -4857,13 +4974,13 @@ { "deps": [ "boringssl", - "boringssl_test_util", - "boringssl_thread_test_lib" + "boringssl_rsa_test_lib", + "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_thread_test", + "name": "boringssl_rsa_test", "src": [], "third_party": true, "type": "target" @@ -4871,13 +4988,41 @@ { "deps": [ "boringssl", - "boringssl_pkcs7_test_lib", + "boringssl_file_test_gtest_lib", "boringssl_test_util" ], "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_pkcs7_test", + "name": "boringssl_file_test_gtest", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_gtest_main_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_gtest_main", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util", + "boringssl_thread_test_lib" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_thread_test", "src": [], "third_party": true, "type": "target" @@ -4926,6 +5071,34 @@ }, { "deps": [ + "boringssl", + "boringssl_span_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_span_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ + "boringssl", + "boringssl_ssl_test_lib", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ssl_test", + "src": [], + "third_party": true, + "type": "target" + }, + { + "deps": [ "bad_client_test", "gpr", "gpr_test_util", @@ -5025,6 +5198,24 @@ "headers": [], "is_filegroup": false, "language": "c", + "name": "large_metadata_bad_client_test", + "src": [ + "test/core/bad_client/tests/large_metadata.cc" + ], + "third_party": false, + "type": "target" + }, + { + "deps": [ + "bad_client_test", + "gpr", + "gpr_test_util", + "grpc_test_util_unsecure", + "grpc_unsecure" + ], + "headers": [], + "is_filegroup": false, + "language": "c", "name": "server_registered_method_bad_client_test", "src": [ "test/core/bad_client/tests/server_registered_method.cc" @@ -6887,31 +7078,35 @@ { "deps": [], "headers": [ - "third_party/boringssl/crypto/aes/internal.h", "third_party/boringssl/crypto/asn1/asn1_locl.h", "third_party/boringssl/crypto/bio/internal.h", - "third_party/boringssl/crypto/bn/internal.h", - "third_party/boringssl/crypto/bn/rsaz_exp.h", "third_party/boringssl/crypto/bytestring/internal.h", - "third_party/boringssl/crypto/cipher/internal.h", + "third_party/boringssl/crypto/cipher_extra/internal.h", "third_party/boringssl/crypto/conf/conf_def.h", "third_party/boringssl/crypto/conf/internal.h", "third_party/boringssl/crypto/curve25519/internal.h", - "third_party/boringssl/crypto/des/internal.h", - "third_party/boringssl/crypto/digest/internal.h", - "third_party/boringssl/crypto/digest/md32_common.h", - "third_party/boringssl/crypto/ec/internal.h", - "third_party/boringssl/crypto/ec/p256-x86_64-table.h", - "third_party/boringssl/crypto/ec/p256-x86_64.h", + "third_party/boringssl/crypto/err/internal.h", "third_party/boringssl/crypto/evp/internal.h", + "third_party/boringssl/crypto/fipsmodule/aes/internal.h", + "third_party/boringssl/crypto/fipsmodule/bn/internal.h", + "third_party/boringssl/crypto/fipsmodule/bn/rsaz_exp.h", + "third_party/boringssl/crypto/fipsmodule/cipher/internal.h", + "third_party/boringssl/crypto/fipsmodule/delocate.h", + "third_party/boringssl/crypto/fipsmodule/des/internal.h", + "third_party/boringssl/crypto/fipsmodule/digest/internal.h", + "third_party/boringssl/crypto/fipsmodule/digest/md32_common.h", + "third_party/boringssl/crypto/fipsmodule/ec/internal.h", + "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64-table.h", + "third_party/boringssl/crypto/fipsmodule/ec/p256-x86_64.h", + "third_party/boringssl/crypto/fipsmodule/modes/internal.h", + "third_party/boringssl/crypto/fipsmodule/rand/internal.h", + "third_party/boringssl/crypto/fipsmodule/rsa/internal.h", "third_party/boringssl/crypto/internal.h", - "third_party/boringssl/crypto/modes/internal.h", "third_party/boringssl/crypto/obj/obj_dat.h", + "third_party/boringssl/crypto/pkcs7/internal.h", "third_party/boringssl/crypto/pkcs8/internal.h", "third_party/boringssl/crypto/poly1305/internal.h", "third_party/boringssl/crypto/pool/internal.h", - "third_party/boringssl/crypto/rand/internal.h", - "third_party/boringssl/crypto/rsa/internal.h", "third_party/boringssl/crypto/x509/charmap.h", "third_party/boringssl/crypto/x509/internal.h", "third_party/boringssl/crypto/x509/vpm_int.h", @@ -6954,6 +7149,7 @@ "third_party/boringssl/include/openssl/ex_data.h", "third_party/boringssl/include/openssl/hkdf.h", "third_party/boringssl/include/openssl/hmac.h", + "third_party/boringssl/include/openssl/is_boringssl.h", "third_party/boringssl/include/openssl/lhash.h", "third_party/boringssl/include/openssl/lhash_macros.h", "third_party/boringssl/include/openssl/md4.h", @@ -6978,11 +7174,11 @@ "third_party/boringssl/include/openssl/rsa.h", "third_party/boringssl/include/openssl/safestack.h", "third_party/boringssl/include/openssl/sha.h", + "third_party/boringssl/include/openssl/span.h", "third_party/boringssl/include/openssl/srtp.h", "third_party/boringssl/include/openssl/ssl.h", "third_party/boringssl/include/openssl/ssl3.h", "third_party/boringssl/include/openssl/stack.h", - "third_party/boringssl/include/openssl/stack_macros.h", "third_party/boringssl/include/openssl/thread.h", "third_party/boringssl/include/openssl/tls1.h", "third_party/boringssl/include/openssl/type_check.h", @@ -7018,8 +7214,10 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_aes_test_lib", - "src": [], + "name": "boringssl_crypto_test_data_lib", + "src": [ + "src/boringssl/crypto_test_data.cc" + ], "third_party": true, "type": "lib" }, @@ -7070,7 +7268,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_bn_test_lib", + "name": "boringssl_bytestring_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7083,7 +7281,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_bytestring_test_lib", + "name": "boringssl_chacha_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7135,6 +7333,19 @@ "headers": [], "is_filegroup": false, "language": "c++", + "name": "boringssl_compiler_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", "name": "boringssl_constant_time_test_lib", "src": [], "third_party": true, @@ -7187,7 +7398,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_digest_test_lib", + "name": "boringssl_dh_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7199,8 +7410,8 @@ ], "headers": [], "is_filegroup": false, - "language": "c", - "name": "boringssl_example_mul_lib", + "language": "c++", + "name": "boringssl_digest_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7213,7 +7424,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_p256-x86_64_test_lib", + "name": "boringssl_dsa_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7239,7 +7450,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_ecdsa_sign_test_lib", + "name": "boringssl_err_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7252,7 +7463,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_ecdsa_test_lib", + "name": "boringssl_evp_extra_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7265,7 +7476,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_ecdsa_verify_test_lib", + "name": "boringssl_evp_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7278,7 +7489,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_evp_extra_test_lib", + "name": "boringssl_pbkdf_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7291,7 +7502,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_evp_test_lib", + "name": "boringssl_scrypt_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7304,7 +7515,85 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_pbkdf_test_lib", + "name": "boringssl_aes_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_bn_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ec_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_p256-x86_64_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ecdsa_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_gcm_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ctrdrbg_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7356,7 +7645,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_gcm_test_lib", + "name": "boringssl_obj_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7369,7 +7658,7 @@ "headers": [], "is_filegroup": false, "language": "c++", - "name": "boringssl_obj_test_lib", + "name": "boringssl_pkcs7_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7446,8 +7735,8 @@ ], "headers": [], "is_filegroup": false, - "language": "c", - "name": "boringssl_thread_test_lib", + "language": "c++", + "name": "boringssl_rsa_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7459,8 +7748,34 @@ ], "headers": [], "is_filegroup": false, - "language": "c", - "name": "boringssl_pkcs7_test_lib", + "language": "c++", + "name": "boringssl_file_test_gtest_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_gtest_main_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_thread_test_lib", "src": [], "third_party": true, "type": "lib" @@ -7485,7 +7800,7 @@ ], "headers": [], "is_filegroup": false, - "language": "c", + "language": "c++", "name": "boringssl_tab_test_lib", "src": [], "third_party": true, @@ -7498,13 +7813,39 @@ ], "headers": [], "is_filegroup": false, - "language": "c", + "language": "c++", "name": "boringssl_v3name_test_lib", "src": [], "third_party": true, "type": "lib" }, { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_span_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { + "deps": [ + "boringssl", + "boringssl_test_util" + ], + "headers": [], + "is_filegroup": false, + "language": "c++", + "name": "boringssl_ssl_test_lib", + "src": [], + "third_party": true, + "type": "lib" + }, + { "deps": [], "headers": [ "third_party/benchmark/include/benchmark/benchmark.h", @@ -8066,6 +8407,8 @@ "src/core/lib/channel/handshaker_factory.cc", "src/core/lib/channel/handshaker_registry.cc", "src/core/lib/compression/compression.cc", + "src/core/lib/compression/compression_internal.cc", + "src/core/lib/compression/compression_ruby.cc", "src/core/lib/compression/message_compress.cc", "src/core/lib/compression/stream_compression.cc", "src/core/lib/compression/stream_compression_gzip.cc", @@ -8204,6 +8547,7 @@ "include/grpc/byte_buffer.h", "include/grpc/byte_buffer_reader.h", "include/grpc/compression.h", + "include/grpc/compression_ruby.h", "include/grpc/fork.h", "include/grpc/grpc.h", "include/grpc/grpc_posix.h", @@ -8223,6 +8567,7 @@ "src/core/lib/channel/handshaker_factory.h", "src/core/lib/channel/handshaker_registry.h", "src/core/lib/compression/algorithm_metadata.h", + "src/core/lib/compression/compression_internal.h", "src/core/lib/compression/message_compress.h", "src/core/lib/compression/stream_compression.h", "src/core/lib/compression/stream_compression_gzip.h", @@ -8345,6 +8690,7 @@ "include/grpc/byte_buffer.h", "include/grpc/byte_buffer_reader.h", "include/grpc/compression.h", + "include/grpc/compression_ruby.h", "include/grpc/fork.h", "include/grpc/grpc.h", "include/grpc/grpc_posix.h", @@ -8364,6 +8710,7 @@ "src/core/lib/channel/handshaker_factory.h", "src/core/lib/channel/handshaker_registry.h", "src/core/lib/compression/algorithm_metadata.h", + "src/core/lib/compression/compression_internal.h", "src/core/lib/compression/message_compress.h", "src/core/lib/compression/stream_compression.h", "src/core/lib/compression/stream_compression_gzip.h", @@ -9431,8 +9778,8 @@ "tsi_interface" ], "headers": [ + "src/core/tsi/alts_transport_security.h", "src/core/tsi/fake_transport_security.h", - "src/core/tsi/gts_transport_security.h", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/ssl_types.h", "src/core/tsi/transport_security_grpc.h" @@ -9441,10 +9788,10 @@ "language": "c", "name": "tsi", "src": [ + "src/core/tsi/alts_transport_security.cc", + "src/core/tsi/alts_transport_security.h", "src/core/tsi/fake_transport_security.cc", "src/core/tsi/fake_transport_security.h", - "src/core/tsi/gts_transport_security.cc", - "src/core/tsi/gts_transport_security.h", "src/core/tsi/ssl_transport_security.cc", "src/core/tsi/ssl_transport_security.h", "src/core/tsi/ssl_types.h", diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json index 7b23cab506..cbb2428680 100644 --- a/tools/run_tests/generated/tests.json +++ b/tools/run_tests/generated/tests.json @@ -4398,6 +4398,30 @@ "flaky": false, "gtest": true, "language": "c++", + "name": "server_early_return_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [], + "flaky": false, + "gtest": true, + "language": "c++", "name": "server_request_call_test", "platforms": [ "linux", @@ -4769,6 +4793,32 @@ "flaky": false, "gtest": false, "language": "c", + "name": "large_metadata_bad_client_test", + "platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "uses_polling": true + }, + { + "args": [], + "benchmark": false, + "ci_platforms": [ + "linux", + "mac", + "posix", + "windows" + ], + "cpu_cost": 1.0, + "exclude_configs": [], + "exclude_iomgrs": [ + "uv" + ], + "flaky": false, + "gtest": false, + "language": "c", "name": "server_registered_method_bad_client_test", "platforms": [ "linux", @@ -4929,9 +4979,7 @@ "uses_polling": true }, { - "args": [ - "third_party/boringssl/crypto/aes/aes_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -4946,8 +4994,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aes_test", + "name": "boringssl_crypto_test_data", "platforms": [ "linux", "mac", @@ -4971,6 +5020,7 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", "name": "boringssl_asn1_test", "platforms": [ @@ -4996,6 +5046,7 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", "name": "boringssl_base64_test", "platforms": [ @@ -5021,6 +5072,7 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", "name": "boringssl_bio_test", "platforms": [ @@ -5031,33 +5083,6 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/bn/bn_tests.txt" - ], - "boringssl": true, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "defaults": "boringssl", - "exclude_configs": [ - "asan", - "ubsan" - ], - "flaky": false, - "language": "c++", - "name": "boringssl_bn_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { "args": [], "boringssl": true, "ci_platforms": [ @@ -5073,6 +5098,7 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", "name": "boringssl_bytestring_test", "platforms": [ @@ -5083,178 +5109,7 @@ ] }, { - "args": [ - "aes-128-gcm", - "third_party/boringssl/crypto/cipher/test/aes_128_gcm_tests.txt" - ], - "boringssl": true, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "defaults": "boringssl", - "exclude_configs": [ - "asan", - "ubsan" - ], - "flaky": false, - "language": "c++", - "name": "boringssl_aead_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [ - "aes-256-gcm", - "third_party/boringssl/crypto/cipher/test/aes_256_gcm_tests.txt" - ], - "boringssl": true, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "defaults": "boringssl", - "exclude_configs": [ - "asan", - "ubsan" - ], - "flaky": false, - "language": "c++", - "name": "boringssl_aead_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [ - "aes-128-gcm-siv", - "third_party/boringssl/crypto/cipher/test/aes_128_gcm_siv_tests.txt" - ], - "boringssl": true, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "defaults": "boringssl", - "exclude_configs": [ - "asan", - "ubsan" - ], - "flaky": false, - "language": "c++", - "name": "boringssl_aead_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [ - "aes-256-gcm-siv", - "third_party/boringssl/crypto/cipher/test/aes_256_gcm_siv_tests.txt" - ], - "boringssl": true, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "defaults": "boringssl", - "exclude_configs": [ - "asan", - "ubsan" - ], - "flaky": false, - "language": "c++", - "name": "boringssl_aead_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [ - "chacha20-poly1305", - "third_party/boringssl/crypto/cipher/test/chacha20_poly1305_tests.txt" - ], - "boringssl": true, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "defaults": "boringssl", - "exclude_configs": [ - "asan", - "ubsan" - ], - "flaky": false, - "language": "c++", - "name": "boringssl_aead_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [ - "aes-128-cbc-sha1-tls", - "third_party/boringssl/crypto/cipher/test/aes_128_cbc_sha1_tls_tests.txt" - ], - "boringssl": true, - "ci_platforms": [ - "linux", - "mac", - "posix", - "windows" - ], - "cpu_cost": 1.0, - "defaults": "boringssl", - "exclude_configs": [ - "asan", - "ubsan" - ], - "flaky": false, - "language": "c++", - "name": "boringssl_aead_test", - "platforms": [ - "linux", - "mac", - "posix", - "windows" - ] - }, - { - "args": [ - "aes-128-cbc-sha1-tls-implicit-iv", - "third_party/boringssl/crypto/cipher/test/aes_128_cbc_sha1_tls_implicit_iv_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5269,8 +5124,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_chacha_test", "platforms": [ "linux", "mac", @@ -5279,10 +5135,7 @@ ] }, { - "args": [ - "aes-128-cbc-sha256-tls", - "third_party/boringssl/crypto/cipher/test/aes_128_cbc_sha256_tls_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5297,6 +5150,7 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", "name": "boringssl_aead_test", "platforms": [ @@ -5307,10 +5161,7 @@ ] }, { - "args": [ - "aes-256-cbc-sha1-tls", - "third_party/boringssl/crypto/cipher/test/aes_256_cbc_sha1_tls_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5325,8 +5176,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_cipher_test", "platforms": [ "linux", "mac", @@ -5335,10 +5187,7 @@ ] }, { - "args": [ - "aes-256-cbc-sha1-tls-implicit-iv", - "third_party/boringssl/crypto/cipher/test/aes_256_cbc_sha1_tls_implicit_iv_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5353,8 +5202,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_cmac_test", "platforms": [ "linux", "mac", @@ -5363,10 +5213,7 @@ ] }, { - "args": [ - "aes-256-cbc-sha256-tls", - "third_party/boringssl/crypto/cipher/test/aes_256_cbc_sha256_tls_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5381,8 +5228,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_compiler_test", "platforms": [ "linux", "mac", @@ -5391,10 +5239,7 @@ ] }, { - "args": [ - "aes-256-cbc-sha384-tls", - "third_party/boringssl/crypto/cipher/test/aes_256_cbc_sha384_tls_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5409,8 +5254,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_constant_time_test", "platforms": [ "linux", "mac", @@ -5419,10 +5265,7 @@ ] }, { - "args": [ - "des-ede3-cbc-sha1-tls", - "third_party/boringssl/crypto/cipher/test/des_ede3_cbc_sha1_tls_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5437,8 +5280,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_ed25519_test", "platforms": [ "linux", "mac", @@ -5447,10 +5291,7 @@ ] }, { - "args": [ - "des-ede3-cbc-sha1-tls-implicit-iv", - "third_party/boringssl/crypto/cipher/test/des_ede3_cbc_sha1_tls_implicit_iv_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5465,8 +5306,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_spake25519_test", "platforms": [ "linux", "mac", @@ -5475,10 +5317,7 @@ ] }, { - "args": [ - "aes-128-cbc-sha1-ssl3", - "third_party/boringssl/crypto/cipher/test/aes_128_cbc_sha1_ssl3_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5493,8 +5332,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_x25519_test", "platforms": [ "linux", "mac", @@ -5503,10 +5343,7 @@ ] }, { - "args": [ - "aes-256-cbc-sha1-ssl3", - "third_party/boringssl/crypto/cipher/test/aes_256_cbc_sha1_ssl3_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5521,8 +5358,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_dh_test", "platforms": [ "linux", "mac", @@ -5531,10 +5369,7 @@ ] }, { - "args": [ - "des-ede3-cbc-sha1-ssl3", - "third_party/boringssl/crypto/cipher/test/des_ede3_cbc_sha1_ssl3_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5549,8 +5384,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_digest_test", "platforms": [ "linux", "mac", @@ -5559,10 +5395,7 @@ ] }, { - "args": [ - "aes-128-ctr-hmac-sha256", - "third_party/boringssl/crypto/cipher/test/aes_128_ctr_hmac_sha256.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5577,8 +5410,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_dsa_test", "platforms": [ "linux", "mac", @@ -5587,10 +5421,7 @@ ] }, { - "args": [ - "aes-256-ctr-hmac-sha256", - "third_party/boringssl/crypto/cipher/test/aes_256_ctr_hmac_sha256.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5605,8 +5436,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_aead_test", + "name": "boringssl_ecdh_test", "platforms": [ "linux", "mac", @@ -5615,9 +5447,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/cipher/test/cipher_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5632,8 +5462,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_cipher_test", + "name": "boringssl_err_test", "platforms": [ "linux", "mac", @@ -5657,8 +5488,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_cmac_test", + "name": "boringssl_evp_extra_test", "platforms": [ "linux", "mac", @@ -5682,8 +5514,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_constant_time_test", + "name": "boringssl_evp_test", "platforms": [ "linux", "mac", @@ -5692,9 +5525,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/curve25519/ed25519_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5709,8 +5540,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_ed25519_test", + "name": "boringssl_pbkdf_test", "platforms": [ "linux", "mac", @@ -5734,8 +5566,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_x25519_test", + "name": "boringssl_scrypt_test", "platforms": [ "linux", "mac", @@ -5759,8 +5592,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_spake25519_test", + "name": "boringssl_aes_test", "platforms": [ "linux", "mac", @@ -5784,8 +5618,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_digest_test", + "name": "boringssl_bn_test", "platforms": [ "linux", "mac", @@ -5809,8 +5644,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_example_mul", + "name": "boringssl_ec_test", "platforms": [ "linux", "mac", @@ -5819,9 +5655,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/ec/p256-x86_64_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5836,6 +5670,7 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", "name": "boringssl_p256-x86_64_test", "platforms": [ @@ -5846,9 +5681,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/ecdh/ecdh_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5863,8 +5696,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_ecdh_test", + "name": "boringssl_ecdsa_test", "platforms": [ "linux", "mac", @@ -5873,9 +5707,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/ecdsa/ecdsa_sign_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5890,8 +5722,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_ecdsa_sign_test", + "name": "boringssl_gcm_test", "platforms": [ "linux", "mac", @@ -5915,8 +5748,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_ecdsa_test", + "name": "boringssl_ctrdrbg_test", "platforms": [ "linux", "mac", @@ -5925,9 +5759,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/ecdsa/ecdsa_verify_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5942,8 +5774,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_ecdsa_verify_test", + "name": "boringssl_hkdf_test", "platforms": [ "linux", "mac", @@ -5967,8 +5800,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_evp_extra_test", + "name": "boringssl_hmac_test", "platforms": [ "linux", "mac", @@ -5977,9 +5811,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/evp/evp_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -5994,8 +5826,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_evp_test", + "name": "boringssl_lhash_test", "platforms": [ "linux", "mac", @@ -6019,8 +5852,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_pbkdf_test", + "name": "boringssl_obj_test", "platforms": [ "linux", "mac", @@ -6044,8 +5878,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_hkdf_test", + "name": "boringssl_pkcs7_test", "platforms": [ "linux", "mac", @@ -6054,9 +5889,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/hmac/hmac_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -6071,8 +5904,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_hmac_test", + "name": "boringssl_pkcs12_test", "platforms": [ "linux", "mac", @@ -6096,8 +5930,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_lhash_test", + "name": "boringssl_pkcs8_test", "platforms": [ "linux", "mac", @@ -6121,8 +5956,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_gcm_test", + "name": "boringssl_poly1305_test", "platforms": [ "linux", "mac", @@ -6146,8 +5982,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_obj_test", + "name": "boringssl_pool_test", "platforms": [ "linux", "mac", @@ -6171,8 +6008,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_pkcs12_test", + "name": "boringssl_refcount_test", "platforms": [ "linux", "mac", @@ -6196,8 +6034,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_pkcs8_test", + "name": "boringssl_rsa_test", "platforms": [ "linux", "mac", @@ -6206,9 +6045,7 @@ ] }, { - "args": [ - "third_party/boringssl/crypto/poly1305/poly1305_tests.txt" - ], + "args": [], "boringssl": true, "ci_platforms": [ "linux", @@ -6223,8 +6060,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_poly1305_test", + "name": "boringssl_file_test_gtest", "platforms": [ "linux", "mac", @@ -6248,8 +6086,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_pool_test", + "name": "boringssl_gtest_main", "platforms": [ "linux", "mac", @@ -6273,8 +6112,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_refcount_test", + "name": "boringssl_thread_test", "platforms": [ "linux", "mac", @@ -6298,8 +6138,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_thread_test", + "name": "boringssl_x509_test", "platforms": [ "linux", "mac", @@ -6323,8 +6164,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_pkcs7_test", + "name": "boringssl_tab_test", "platforms": [ "linux", "mac", @@ -6348,8 +6190,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_x509_test", + "name": "boringssl_v3name_test", "platforms": [ "linux", "mac", @@ -6373,8 +6216,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_tab_test", + "name": "boringssl_span_test", "platforms": [ "linux", "mac", @@ -6398,8 +6242,9 @@ "ubsan" ], "flaky": false, + "gtest": true, "language": "c++", - "name": "boringssl_v3name_test", + "name": "boringssl_ssl_test", "platforms": [ "linux", "mac", diff --git a/tools/run_tests/interop/android/android_interop_helper.sh b/tools/run_tests/interop/android/android_interop_helper.sh index 9c0d18fba3..116549b83e 100755 --- a/tools/run_tests/interop/android/android_interop_helper.sh +++ b/tools/run_tests/interop/android/android_interop_helper.sh @@ -18,7 +18,7 @@ SERVICE_KEY=$1 -gcloud auth activate-service-account --key-file=$SERVICE_KEY || exit 1 +gcloud auth activate-service-account --key-file="$SERVICE_KEY" || exit 1 gcloud config set project grpc-testing || exit 1 rm -rf grpc-java diff --git a/tools/run_tests/interop/android/run_android_tests_on_firebase.sh b/tools/run_tests/interop/android/run_android_tests_on_firebase.sh index 0b4811355c..f6472eba55 100755 --- a/tools/run_tests/interop/android/run_android_tests_on_firebase.sh +++ b/tools/run_tests/interop/android/run_android_tests_on_firebase.sh @@ -21,7 +21,7 @@ DOCKER_TAG=android_interop_test SERVICE_KEY=~/android-interops-service-key.json HELPER=$(pwd)/tools/run_tests/interop/android/android_interop_helper.sh -docker build -t $DOCKER_TAG -f $DOCKERFILE . +docker build -t "$DOCKER_TAG" -f "$DOCKERFILE" . docker run --interactive --rm \ --volume="$SERVICE_KEY":/service-key.json:ro \ diff --git a/tools/run_tests/interop/with_nvm.sh b/tools/run_tests/interop/with_nvm.sh index a1c3f3e0a6..887f9f6a9f 100755 --- a/tools/run_tests/interop/with_nvm.sh +++ b/tools/run_tests/interop/with_nvm.sh @@ -16,4 +16,4 @@ # Makes sure NVM is loaded before executing the command passed as an argument source ~/.nvm/nvm.sh -$@ +"$@" diff --git a/tools/run_tests/interop/with_rvm.sh b/tools/run_tests/interop/with_rvm.sh index c3e2882330..41e6efcb56 100755 --- a/tools/run_tests/interop/with_rvm.sh +++ b/tools/run_tests/interop/with_rvm.sh @@ -16,4 +16,4 @@ # Makes sure RVM is loaded before executing the command passed as an argument source /usr/local/rvm/scripts/rvm -$@ +"$@" diff --git a/tools/run_tests/performance/build_performance.sh b/tools/run_tests/performance/build_performance.sh index e7d8db8e3e..22e0ca9fa0 100755 --- a/tools/run_tests/performance/build_performance.sh +++ b/tools/run_tests/performance/build_performance.sh @@ -16,7 +16,7 @@ source ~/.rvm/scripts/rvm set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." CONFIG=${CONFIG:-opt} @@ -28,11 +28,11 @@ then # TODO(jtattermusch): not embedding OpenSSL breaks the C# build because # grpc_csharp_ext needs OpenSSL embedded and some intermediate files from # this build will be reused. - make CONFIG=${CONFIG} EMBED_OPENSSL=true EMBED_ZLIB=true qps_worker qps_json_driver -j8 + make CONFIG="${CONFIG}" EMBED_OPENSSL=true EMBED_ZLIB=true qps_worker qps_json_driver -j8 fi PHP_ALREADY_BUILT="" -for language in $@ +for language in "$@" do case "$language" in "c++") @@ -53,10 +53,10 @@ do fi ;; "csharp") - python tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 --compiler coreclr + python tools/run_tests/run_tests.py -l "$language" -c "$CONFIG" --build_only -j 8 --compiler coreclr ;; *) - python tools/run_tests/run_tests.py -l $language -c $CONFIG --build_only -j 8 + python tools/run_tests/run_tests.py -l "$language" -c "$CONFIG" --build_only -j 8 ;; esac done diff --git a/tools/run_tests/performance/build_performance_go.sh b/tools/run_tests/performance/build_performance_go.sh index 5e97fb68d3..812728d4ce 100755 --- a/tools/run_tests/performance/build_performance_go.sh +++ b/tools/run_tests/performance/build_performance_go.sh @@ -15,7 +15,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." export GOPATH=$(pwd)/../gopath @@ -24,6 +24,6 @@ go get google.golang.org/grpc rm -rf "${GOPATH}/src/google.golang.org/grpc" # Get the revision of grpc-go we want to test -git clone --recursive ../grpc-go ${GOPATH}/src/google.golang.org/grpc +git clone --recursive ../grpc-go "${GOPATH}/src/google.golang.org/grpc" -(cd ${GOPATH}/src/google.golang.org/grpc/benchmark/worker && go install) +(cd "${GOPATH}/src/google.golang.org/grpc/benchmark/worker" && go install) diff --git a/tools/run_tests/performance/build_performance_php7.sh b/tools/run_tests/performance/build_performance_php7.sh index 141c9fd1c8..37ca9ee877 100755 --- a/tools/run_tests/performance/build_performance_php7.sh +++ b/tools/run_tests/performance/build_performance_php7.sh @@ -15,9 +15,9 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." CONFIG=${CONFIG:-opt} -python tools/run_tests/run_tests.py -l php7 -c $CONFIG --build_only -j 8 +python tools/run_tests/run_tests.py -l php7 -c "$CONFIG" --build_only -j 8 # Set up all dependences needed for PHP QPS test cd src/php/tests/qps diff --git a/tools/run_tests/performance/kill_workers.sh b/tools/run_tests/performance/kill_workers.sh index efe7282c0a..95a5bf5dcb 100755 --- a/tools/run_tests/performance/kill_workers.sh +++ b/tools/run_tests/performance/kill_workers.sh @@ -15,7 +15,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." # Make sure there are no pre-existing QPS workers around before starting # the performance test suite @@ -24,13 +24,17 @@ cd $(dirname $0)/../../.. killall -9 qps_worker || true # C# +# shellcheck disable=SC2009 ps -C mono -o pid=,cmd= | grep QpsWorker | awk '{print $1}' | xargs kill -9 || true +# shellcheck disable=SC2009 ps -C dotnet -o pid=,cmd= | grep QpsWorker | awk '{print $1}' | xargs kill -9 || true # Ruby +# shellcheck disable=SC2009 ps -C ruby -o pid=,cmd= | grep 'qps/worker.rb' | awk '{print $1}' | xargs kill -9 || true # Python +# shellcheck disable=SC2009 ps -C python -o pid=,cmd= | grep 'qps_worker.py' | awk '{print $1}' | xargs kill -9 || true # Java diff --git a/tools/run_tests/performance/process_local_perf_flamegraphs.sh b/tools/run_tests/performance/process_local_perf_flamegraphs.sh index d0c22f2070..ccb5b19f2a 100755 --- a/tools/run_tests/performance/process_local_perf_flamegraphs.sh +++ b/tools/run_tests/performance/process_local_perf_flamegraphs.sh @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -mkdir -p $OUTPUT_DIR +mkdir -p "$OUTPUT_DIR" -PERF_DATA_FILE=${PERF_BASE_NAME}-perf.data -PERF_SCRIPT_OUTPUT=${PERF_BASE_NAME}-out.perf +PERF_DATA_FILE="${PERF_BASE_NAME}-perf.data" +PERF_SCRIPT_OUTPUT="${PERF_BASE_NAME}-out.perf" # Generate Flame graphs echo "running perf script on $PERF_DATA_FILE" -perf script -i $PERF_DATA_FILE > $PERF_SCRIPT_OUTPUT +perf script -i "$PERF_DATA_FILE" > "$PERF_SCRIPT_OUTPUT" -~/FlameGraph/stackcollapse-perf.pl $PERF_SCRIPT_OUTPUT | ~/FlameGraph/flamegraph.pl > ${OUTPUT_DIR}/${OUTPUT_FILENAME}.svg +~/FlameGraph/stackcollapse-perf.pl "$PERF_SCRIPT_OUTPUT" | ~/FlameGraph/flamegraph.pl > "${OUTPUT_DIR}/${OUTPUT_FILENAME}.svg" diff --git a/tools/run_tests/performance/process_remote_perf_flamegraphs.sh b/tools/run_tests/performance/process_remote_perf_flamegraphs.sh index a0c4f6ff32..2ea6b4f2a6 100755 --- a/tools/run_tests/performance/process_remote_perf_flamegraphs.sh +++ b/tools/run_tests/performance/process_remote_perf_flamegraphs.sh @@ -13,17 +13,18 @@ # See the License for the specific language governing permissions and # limitations under the License. -mkdir -p $OUTPUT_DIR +mkdir -p "$OUTPUT_DIR" -PERF_DATA_FILE=${PERF_BASE_NAME}-perf.data -PERF_SCRIPT_OUTPUT=${PERF_BASE_NAME}-out.perf +PERF_DATA_FILE="${PERF_BASE_NAME}-perf.data" +PERF_SCRIPT_OUTPUT="${PERF_BASE_NAME}-out.perf" # Generate Flame graphs echo "running perf script on $USER_AT_HOST with perf.data" -ssh $USER_AT_HOST "cd ~/performance_workspace/grpc && perf script -i $PERF_DATA_FILE | gzip > ${PERF_SCRIPT_OUTPUT}.gz" +# shellcheck disable=SC2029 +ssh "$USER_AT_HOST" "cd ~/performance_workspace/grpc && perf script -i $PERF_DATA_FILE | gzip > ${PERF_SCRIPT_OUTPUT}.gz" -scp $USER_AT_HOST:~/performance_workspace/grpc/$PERF_SCRIPT_OUTPUT.gz . +scp "$USER_AT_HOST:~/performance_workspace/grpc/$PERF_SCRIPT_OUTPUT.gz" . -gzip -d -f $PERF_SCRIPT_OUTPUT.gz +gzip -d -f "$PERF_SCRIPT_OUTPUT.gz" -~/FlameGraph/stackcollapse-perf.pl --kernel $PERF_SCRIPT_OUTPUT | ~/FlameGraph/flamegraph.pl --color=java --hash > ${OUTPUT_DIR}/${OUTPUT_FILENAME}.svg +~/FlameGraph/stackcollapse-perf.pl --kernel "$PERF_SCRIPT_OUTPUT" | ~/FlameGraph/flamegraph.pl --color=java --hash > "${OUTPUT_DIR}/${OUTPUT_FILENAME}.svg" diff --git a/tools/run_tests/performance/remote_host_build.sh b/tools/run_tests/performance/remote_host_build.sh index 75352e9220..862bd6c05f 100755 --- a/tools/run_tests/performance/remote_host_build.sh +++ b/tools/run_tests/performance/remote_host_build.sh @@ -15,7 +15,8 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." # execute the build script remotely +# shellcheck disable=SC2029 ssh "${USER_AT_HOST}" "CONFIG=${CONFIG} ~/performance_workspace/grpc/tools/run_tests/performance/build_performance.sh $*" diff --git a/tools/run_tests/performance/remote_host_prepare.sh b/tools/run_tests/performance/remote_host_prepare.sh index bf91acbddf..d69c85b40e 100755 --- a/tools/run_tests/performance/remote_host_prepare.sh +++ b/tools/run_tests/performance/remote_host_prepare.sh @@ -15,7 +15,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." # TODO(jtattermusch): To be sure there are no running processes that would # mess with the results, be rough and reboot the slave here @@ -24,7 +24,7 @@ ssh "${USER_AT_HOST}" "killall -9 qps_worker dotnet mono node ruby worker || tru # On Windows, killall is not supported & we need to kill all pending workers # before attempting to delete the workspace -ssh "${USER_AT_HOST}" "ps -e | egrep 'qps_worker|dotnet' | awk '{print $1}' | xargs kill -9 || true" +ssh "${USER_AT_HOST}" "ps -e | egrep 'qps_worker|dotnet' | awk '{print \$1}' | xargs kill -9 || true" # cleanup after previous builds ssh "${USER_AT_HOST}" "rm -rf ~/performance_workspace && mkdir -p ~/performance_workspace" @@ -36,4 +36,5 @@ scp ../grpc.tar "${USER_AT_HOST}:~/performance_workspace" ssh "${USER_AT_HOST}" "tar -xf ~/performance_workspace/grpc.tar -C ~/performance_workspace || tar -xf ~/performance_workspace/grpc.tar -C ~/performance_workspace" # For consistency with local run, invoke the kill_workers script remotely. +# shellcheck disable=SC2088 ssh "${USER_AT_HOST}" "~/performance_workspace/grpc/tools/run_tests/performance/kill_workers.sh" diff --git a/tools/run_tests/performance/run_netperf.sh b/tools/run_tests/performance/run_netperf.sh index b415ede529..2a32051dac 100755 --- a/tools/run_tests/performance/run_netperf.sh +++ b/tools/run_tests/performance/run_netperf.sh @@ -15,7 +15,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." netperf >netperf_latency.txt -P 0 -t TCP_RR -H "$NETPERF_SERVER_HOST" -- -r 1,1 -o P50_LATENCY,P90_LATENCY,P99_LATENCY diff --git a/tools/run_tests/performance/run_qps_driver.sh b/tools/run_tests/performance/run_qps_driver.sh index 1851632da1..2d9e310dec 100755 --- a/tools/run_tests/performance/run_qps_driver.sh +++ b/tools/run_tests/performance/run_qps_driver.sh @@ -15,7 +15,7 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." bins/opt/qps_json_driver "$@" diff --git a/tools/run_tests/performance/run_worker_csharp.sh b/tools/run_tests/performance/run_worker_csharp.sh index e2e941f34a..6546d6010b 100755 --- a/tools/run_tests/performance/run_worker_csharp.sh +++ b/tools/run_tests/performance/run_worker_csharp.sh @@ -15,9 +15,9 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." # needed to correctly locate testca cd src/csharp/Grpc.IntegrationTesting.QpsWorker/bin/Release/netcoreapp1.0 -dotnet exec Grpc.IntegrationTesting.QpsWorker.dll $@ +dotnet exec Grpc.IntegrationTesting.QpsWorker.dll "$@" diff --git a/tools/run_tests/performance/run_worker_go.sh b/tools/run_tests/performance/run_worker_go.sh index 6d8abb4147..f8e821a265 100755 --- a/tools/run_tests/performance/run_worker_go.sh +++ b/tools/run_tests/performance/run_worker_go.sh @@ -15,8 +15,8 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." export GOPATH=$(pwd)/../gopath -${GOPATH}/bin/worker $@ +"${GOPATH}/bin/worker" "$@" diff --git a/tools/run_tests/performance/run_worker_java.sh b/tools/run_tests/performance/run_worker_java.sh index 039a9618e1..cff6faf680 100755 --- a/tools/run_tests/performance/run_worker_java.sh +++ b/tools/run_tests/performance/run_worker_java.sh @@ -16,9 +16,9 @@ set -ex # Enter repo root -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." # Enter the grpc-java repo root (expected to be next to grpc repo root) cd ../grpc-java -benchmarks/build/install/grpc-benchmarks/bin/benchmark_worker $@ +benchmarks/build/install/grpc-benchmarks/bin/benchmark_worker "$@" diff --git a/tools/run_tests/performance/run_worker_php.sh b/tools/run_tests/performance/run_worker_php.sh index 8c7ceef2ff..2fe2493e60 100755 --- a/tools/run_tests/performance/run_worker_php.sh +++ b/tools/run_tests/performance/run_worker_php.sh @@ -16,8 +16,8 @@ source ~/.rvm/scripts/rvm set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." # The proxy worker for PHP is implemented in Ruby -ruby src/ruby/qps/proxy-worker.rb $@ +ruby src/ruby/qps/proxy-worker.rb "$@" diff --git a/tools/run_tests/performance/run_worker_python.sh b/tools/run_tests/performance/run_worker_python.sh index cd7d0ebbae..01241c8296 100755 --- a/tools/run_tests/performance/run_worker_python.sh +++ b/tools/run_tests/performance/run_worker_python.sh @@ -15,6 +15,6 @@ set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." -PYTHONPATH=src/python/grpcio_tests:src/python/gens py27/bin/python src/python/grpcio_tests/tests/qps/qps_worker.py $@ +PYTHONPATH=src/python/grpcio_tests:src/python/gens py27/bin/python src/python/grpcio_tests/tests/qps/qps_worker.py "$@" diff --git a/tools/run_tests/performance/run_worker_ruby.sh b/tools/run_tests/performance/run_worker_ruby.sh index db8a7d8cd6..729c5cec97 100755 --- a/tools/run_tests/performance/run_worker_ruby.sh +++ b/tools/run_tests/performance/run_worker_ruby.sh @@ -16,6 +16,6 @@ source ~/.rvm/scripts/rvm set -ex -cd $(dirname $0)/../../.. +cd "$(dirname "$0")/../../.." -ruby src/ruby/qps/worker.rb $@ +ruby src/ruby/qps/worker.rb "$@" diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 6b27d6f875..b751bf9714 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -507,6 +507,8 @@ class CLanguage(object): return ('jessie', self._gcc_make_options(version_suffix='-4.8')) elif compiler == 'gcc5.3': return ('ubuntu1604', []) + elif compiler == 'gcc7.2': + return ('ubuntu1710', []) elif compiler == 'gcc_musl': return ('alpine', []) elif compiler == 'clang3.4': @@ -1327,8 +1329,8 @@ argp.add_argument( argp.add_argument( '--compiler', choices=[ - 'default', 'gcc4.4', 'gcc4.6', 'gcc4.8', 'gcc4.9', 'gcc5.3', 'gcc_musl', - 'clang3.4', 'clang3.5', 'clang3.6', 'clang3.7', 'python2.7', + 'default', 'gcc4.4', 'gcc4.6', 'gcc4.8', 'gcc4.9', 'gcc5.3', 'gcc7.2', + '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', '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 ae3a28bde5..433137a9bc 100755 --- a/tools/run_tests/run_tests_matrix.py +++ b/tools/run_tests/run_tests_matrix.py @@ -260,7 +260,8 @@ def _create_portability_test_jobs(extra_args=[], # portability C and C++ on x64 for compiler in [ - 'gcc4.8', 'gcc5.3', 'gcc_musl', 'clang3.5', 'clang3.6', 'clang3.7' + 'gcc4.8', 'gcc5.3', 'gcc7.2', 'gcc_musl', 'clang3.5', 'clang3.6', + 'clang3.7' ]: test_jobs += _generate_jobs( languages=['c', 'c++'], diff --git a/tools/run_tests/sanity/check_shellcheck.sh b/tools/run_tests/sanity/check_shellcheck.sh index b30febab04..64f59cb40e 100755 --- a/tools/run_tests/sanity/check_shellcheck.sh +++ b/tools/run_tests/sanity/check_shellcheck.sh @@ -19,9 +19,7 @@ set -e ROOT="$(dirname "$0")/../../.." DIRS=( - 'tools/run_tests/artifacts' - 'tools/run_tests/helper_scripts' - 'tools/run_tests/sanity' + 'tools/run_tests' ) for dir in "${DIRS[@]}"; do diff --git a/tools/run_tests/sanity/check_submodules.sh b/tools/run_tests/sanity/check_submodules.sh index ca604c6e52..bbe32f499d 100755 --- a/tools/run_tests/sanity/check_submodules.sh +++ b/tools/run_tests/sanity/check_submodules.sh @@ -27,7 +27,7 @@ want_submodules=$(mktemp /tmp/submXXXXXX) git submodule | awk '{ print $1 }' | sort > "$submodules" cat << EOF | awk '{ print $1 }' | sort > "$want_submodules" 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f8 third_party/benchmark (v1.2.0) - be2ee342d3781ddb954f91f8a7e660c6f59e87e5 third_party/boringssl (heads/chromium-stable) + 4d7ba4e4e57195fcebdabe01489534b446ad02cb third_party/boringssl (heads/chromium-stable) 886e7d75368e3f4fab3f4d0d3584e4abfc557755 third_party/boringssl-with-bazel (version_for_cocoapods_7.0-857-g886e7d7) 30dbc81fb5ffdc98ea9b14b1918bfe4e8779b26e third_party/gflags (v2.2.0) ec44c6c1675c25b9827aacd08c02433cccde7780 third_party/googletest (release-1.8.0) |