fixed incorrect directory when using EXTERNAL_GIT_ROOT in Docker cloning var

pull/8182/head
Matt Kwong 8 years ago
parent 41a56ac8ac
commit a436bab47f
  1. 2
      test/distrib/cpp/run_distrib_test.sh
  2. 2
      tools/run_tests/dockerize/docker_run.sh

@ -34,7 +34,7 @@ git clone $EXTERNAL_GIT_ROOT
cd grpc cd grpc
# clone submodules # 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) }' submodule update --init --reference " EXTERNAL_GIT_ROOT$2 " " $2) }'
cd third_party/protobuf && ./autogen.sh && \ cd third_party/protobuf && ./autogen.sh && \

@ -39,7 +39,7 @@ then
git clone "$EXTERNAL_GIT_ROOT" /var/local/git/grpc git clone "$EXTERNAL_GIT_ROOT" /var/local/git/grpc
# clone gRPC submodules # clone gRPC submodules
(cd var/local/git/grpc && exec git submodule | awk -v \ (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) }') --reference " EXTERNAL_GIT_ROOT$2 " " $2) }')
else else
mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH" mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH"

Loading…
Cancel
Save