aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/distrib/cpp/run_distrib_test.sh
diff options
context:
space:
mode:
authorGravatar Mark D. Roth <roth@google.com>2016-10-14 13:10:54 -0700
committerGravatar Mark D. Roth <roth@google.com>2016-10-14 13:10:54 -0700
commitd7ec5e18cebc3d7fcfbc1a187b7407bf9f4ba38a (patch)
tree2a261657f3bf88314e00978fb6a42b94b1a7c32a /test/distrib/cpp/run_distrib_test.sh
parentff08f33e094640caf8e8ce5d8d2a2f82c3cc4f3b (diff)
parentf3d71d21b9d115d8e4fdbe29f019918af09c7b13 (diff)
Merge remote-tracking branch 'upstream/master' into service_config
Diffstat (limited to 'test/distrib/cpp/run_distrib_test.sh')
-rwxr-xr-xtest/distrib/cpp/run_distrib_test.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/distrib/cpp/run_distrib_test.sh b/test/distrib/cpp/run_distrib_test.sh
index bc84b84b8f..15fbf28107 100755
--- a/test/distrib/cpp/run_distrib_test.sh
+++ b/test/distrib/cpp/run_distrib_test.sh
@@ -30,7 +30,12 @@
set -ex
-git clone --recursive $EXTERNAL_GIT_ROOT
+git clone $EXTERNAL_GIT_ROOT
+# clone gRPC submodules, use data from locally cloned submodules where possible
+(cd ${EXTERNAL_GIT_ROOT} && git submodule foreach 'cd /var/local/git/grpc \
+&& git submodule update --init --reference ${EXTERNAL_GIT_ROOT}/${name} \
+${name}')
+
cd grpc
cd third_party/protobuf && ./autogen.sh && \