From: Josh Durgin Date: Thu, 23 Jun 2016 00:54:33 +0000 (-0700) Subject: googletest: use ceph branch X-Git-Tag: ses5-milestone5~414^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6661736cbb4e1856bdfe706edf71b9cade2f720;p=ceph.git googletest: use ceph branch Added the same functionality as the previous gtest/gmock branches - .gitignore and not installing shared libs that we only want to statically link to test programs. Signed-off-by: Josh Durgin --- diff --git a/.gitmodules b/.gitmodules index 9ab33e2d0b0..797fe020ea8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,12 +20,10 @@ path = ceph-erasure-code-corpus url = https://github.com/ceph/ceph-erasure-code-corpus.git -# FIXME: The url must be updated after googletest is forked in ceph -# The branch must be updated after a new release (like "release-1.7.5") [submodule "src/googletest"] path = src/googletest - url = https://github.com/google/googletest - branch = master + url = https://github.com/ceph/googletest + branch = ceph-release-1.7.x [submodule "src/spdk"] path = src/spdk url = https://github.com/ceph/spdk.git diff --git a/src/googletest b/src/googletest index d225acc90bc..7f8609b0c26 160000 --- a/src/googletest +++ b/src/googletest @@ -1 +1 @@ -Subproject commit d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0 +Subproject commit 7f8609b0c2670e82fc0372b1610b33efd6be2070