diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-01 14:49:51 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-01 14:49:51 -0800 |
| commit | d2a575a4584e67449306a953af2926947f81014d (patch) | |
| tree | 8a09149f78e269f5dcef2d7fa8ae5802acc19220 /tools/run_tests/interop | |
| parent | 16efe6c750caacdf4fe10ea62605a76761154e7c (diff) | |
| parent | ac47595e42036585a9d9465ba28615d3e4626b13 (diff) | |
Merge branch 'master' into HEAD
Diffstat (limited to 'tools/run_tests/interop')
4 files changed, 4 insertions, 4 deletions
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 -$@ +"$@" |