]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
googletest: use ceph branch
authorJosh Durgin <jdurgin@redhat.com>
Thu, 23 Jun 2016 00:54:33 +0000 (17:54 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Wed, 13 Jul 2016 00:18:09 +0000 (17:18 -0700)
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 <jdurgin@redhat.com>
.gitmodules
src/googletest

index 9ab33e2d0b0397c91fb4b6095fcd2c8d7031dde1..797fe020ea8c888c70e31eb5875468fb2c6f27c9 100644 (file)
        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
index d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0..7f8609b0c2670e82fc0372b1610b33efd6be2070 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0
+Subproject commit 7f8609b0c2670e82fc0372b1610b33efd6be2070