Skip to content

Commit

Permalink
Merge pull request #3846 from ceph/wip-da-gtest-use-submodules
Browse files Browse the repository at this point in the history
Use git submodules for gmock/gtest

Signed-off-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
tchaikov committed Mar 5, 2015
2 parents 874fbd7 + be7b4c3 commit 60e2bec
Show file tree
Hide file tree
Showing 262 changed files with 11 additions and 183,786 deletions.
4 changes: 3 additions & 1 deletion .gitmodules
Expand Up @@ -22,4 +22,6 @@
[submodule "ceph-erasure-code-corpus"]
path = ceph-erasure-code-corpus
url = https://github.com/ceph/ceph-erasure-code-corpus.git

[submodule "src/gmock"]
path = src/gmock
url = https://github.com/ceph/gmock.git
2 changes: 1 addition & 1 deletion autogen.sh
Expand Up @@ -29,7 +29,7 @@ else
fi

if test -d ".git" ; then
if ! git submodule sync || ! git submodule update --init; then
if ! git submodule sync || ! git submodule update --init --recursive; then
echo "Error: could not initialize submodule projects"
echo " Network connectivity might be required."
exit 1
Expand Down
2 changes: 1 addition & 1 deletion doc/dev/corpus.rst
Expand Up @@ -24,7 +24,7 @@ We can generate an object corpus for a particular version of ceph like so.

git clone ceph.git
cd ceph
git submodule update --init
git submodule update --init --recursive

#. Build with flag to dump objects to /tmp/foo::

Expand Down
2 changes: 1 addition & 1 deletion doc/dev/release-process.rst
Expand Up @@ -43,7 +43,7 @@ In the ceph source directory, checkout next branch (for point releases use the {

Checkout the submodules::

git submodule update --init
git submodule update --init --recursive

4. Update Build version numbers
================================
Expand Down
2 changes: 1 addition & 1 deletion doc/install/clone-source.rst
Expand Up @@ -83,7 +83,7 @@ repository.

If your submodules are out of date, run::

git submodule update
git submodule update --init --recursive

Choose a Branch
===============
Expand Down
1 change: 1 addition & 0 deletions src/.gitignore
@@ -1,5 +1,6 @@
# generic entries
Makefile
*.csv

# local directory specific entries
/.git_version
Expand Down
1 change: 1 addition & 0 deletions src/gmock
Submodule gmock added at e4f310
5 changes: 0 additions & 5 deletions src/gmock/.gitignore

This file was deleted.

126 changes: 0 additions & 126 deletions src/gmock/CHANGES

This file was deleted.

171 changes: 0 additions & 171 deletions src/gmock/CMakeLists.txt

This file was deleted.

40 changes: 0 additions & 40 deletions src/gmock/CONTRIBUTORS

This file was deleted.

0 comments on commit 60e2bec

Please sign in to comment.