From 00646d6721a08b01025c11e305493ab790ade781 Mon Sep 17 00:00:00 2001 From: Tom Hromatka Date: Tue, 7 Apr 2020 08:13:23 -0600 Subject: [PATCH] bootstrap: Update bootstrap to support libcgroup-tests This commit updates bootstrap.sh to manage the tests folder now that it's a git submodule copy of libcgroup-tests. Signed-off-by: Tom Hromatka --- bootstrap.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index 6e6dcbb5..d9784c32 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -8,8 +8,15 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then echo "Activated pre-commit hook." fi -# configure googletest +# update the git submodules - libcgroup-tests and googletest git submodule update --init --recursive + +# configure libcgroup-tests +pushd tests +git checkout master +popd + +# configure googletest pushd googletest/googletest git checkout release-1.8.0 cmake -DBUILD_SHARED_LIBS=ON . -- 2.47.2