From a436bab47f394c339b6e8978da3317ff94abfdf8 Mon Sep 17 00:00:00 2001 From: Matt Kwong Date: Thu, 22 Sep 2016 18:49:24 -0700 Subject: [PATCH] fixed incorrect directory when using EXTERNAL_GIT_ROOT in Docker cloning var --- test/distrib/cpp/run_distrib_test.sh | 2 +- tools/run_tests/dockerize/docker_run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/distrib/cpp/run_distrib_test.sh b/test/distrib/cpp/run_distrib_test.sh index cd4158eb5d9..9c8da508334 100755 --- a/test/distrib/cpp/run_distrib_test.sh +++ b/test/distrib/cpp/run_distrib_test.sh @@ -34,7 +34,7 @@ git clone $EXTERNAL_GIT_ROOT cd grpc # clone submodules -git submodule | awk -v EXTERNAL_GIT_ROOT=$EXTERNAL_GIT_ROOT '{ system("git \ +git submodule | awk -v EXTERNAL_GIT_ROOT=$EXTERNAL_GIT_ROOT/ '{ system("git \ submodule update --init --reference " EXTERNAL_GIT_ROOT$2 " " $2) }' cd third_party/protobuf && ./autogen.sh && \ diff --git a/tools/run_tests/dockerize/docker_run.sh b/tools/run_tests/dockerize/docker_run.sh index bb875e275e7..791ed6d7b00 100755 --- a/tools/run_tests/dockerize/docker_run.sh +++ b/tools/run_tests/dockerize/docker_run.sh @@ -39,7 +39,7 @@ then git clone "$EXTERNAL_GIT_ROOT" /var/local/git/grpc # clone gRPC submodules (cd var/local/git/grpc && exec git submodule | awk -v \ - EXTERNAL_GIT_ROOT=$EXTERNAL_GIT_ROOT '{ system("git submodule update --init \ + EXTERNAL_GIT_ROOT=$EXTERNAL_GIT_ROOT/ '{ system("git submodule update --init \ --reference " EXTERNAL_GIT_ROOT$2 " " $2) }') else mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH"