New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

osd/dmclock/testing: reorganize testing, building now optional #15375

Merged
merged 3 commits into from Jun 6, 2017

Conversation

Projects
None yet
6 participants
@ivancich
Member

ivancich commented May 31, 2017

http://tracker.ceph.com/issues/19987

Modify cmake files to take advantage or re-organization of dmclock's
cmake set-up, specifically not having dmclock's cmake files call
add_test. Remove dmclock tests from being dependencies on ceph's
"test" target. Make change so dmclock tests are not built unless
WITH_TESTS and WITH_DMCLOCK_TESTS are both set. This is so openSUSE
Leap will build correctly.

@ivancich ivancich requested review from liewegas and jdurgin May 31, 2017

@ivancich

This comment has been minimized.

Member

ivancich commented May 31, 2017

Trying to get the dmclock testing fixes in sooner rather than later to help the FreeBSD and OpenSUSE folk, so splitting these commits from dmclock integration part 2.

@wjwithagen

Under FreeBSD now the tests are not executed per default.
So this part of the PR works for me.

@liewegas liewegas added the needs-qa label Jun 5, 2017

@jdurgin

jdurgin approved these changes Jun 5, 2017

@@ -1,15 +1,13 @@
# - Find boost
find_path(BOOST_INCLUDE_DIR NAMES boost/variant.hpp
include(FindPackageHandleStandardArgs)

This comment has been minimized.

@tchaikov

tchaikov Jun 6, 2017

Contributor

i wonder, why shall we have our own FindBoost? as cmake ships with its own FindBoost.cmake.

@@ -2,27 +2,30 @@
#
# GTEST_INCLUDE_DIRS - where to find mcas/mcas.h, etc.
# GTEST_LIBRARIES - List of libraries when using mcas.
# GTEST_MAIN_LIBRARIES - List of main libraries when using mcas.

This comment has been minimized.

@tchaikov

tchaikov Jun 6, 2017

Contributor

the same applies to FindGTest.cmake.

This comment has been minimized.

@ivancich

ivancich Jun 6, 2017

Member

I wasn't aware the cmake versions 2.8.11 and later included these. I will remove them and update the PR.

*/
#include <iostream>
// #include <iostream>

This comment has been minimized.

@tchaikov

tchaikov Jun 6, 2017

Contributor

nit, maybe we can just drop this line, if we don't want it at all.

This comment has been minimized.

@ivancich

ivancich Jun 6, 2017

Member

I will clean this up and update the PR. Thanks, Kefu.

ivancich added some commits Jun 6, 2017

Squashed 'src/dmclock/' changes from d6586d7..64bcc6e
64bcc6e Remove FindGTest and FindBoost, which already exist in cmake required version 2.8.11 and later. Also clean up.
ed6dc60 Do some clean-up and remove memory leaks from tests and simulations.
360172a Allow RunEvery object to be ended before destruction via "join" member function.
135b5d0 Fix two bugs discovered by valgrind. Do some other code clean-up as well.
a26d29e Modify cmake files to match naming of cmake's upstream gtest and ceph's boost.
e23e63f Reorganize CMakeLists.txt files, so that projects that incorporate dmclock can control whether add_test is called. Now, add_test is called only at the top-level. Projects that incorporate dmclock can use add_subdirectory on subdirectories beneath the top-level to selective exactly what is included.

git-subtree-dir: src/dmclock
git-subtree-split: 64bcc6ea697c7e790ec4a4229d1bb1d492f9e803
Merge commit '5c612d7e32a07a01b3b97f9cf58f2a3cef0e2e73'
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
osd/dmclock/testing: reorganize testing, building now optional
Modify cmake files to take advantage or re-organization of dmclock's
cmake set-up, specifically not having dmclock's cmake files call
add_test. Remove dmclock tests from being dependencies on ceph's
"test" target. Make change so dmclock tests are not built unless
WITH_TESTS and WITH_DMCLOCK_TESTS are both set. This is so openSUSE
Leap will build correctly.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
@liewegas

This comment has been minimized.

Member

liewegas commented Jun 6, 2017

retest this please

@liewegas liewegas merged commit c674277 into ceph:master Jun 6, 2017

0 of 3 checks passed

Signed-off-by checking if commits are signed
Details
Unmodifed Submodules checking if PR has modified submodules
Details
default Build started sha1 is merged.
Details
@smithfarm

This comment has been minimized.

Contributor

smithfarm commented Jun 24, 2017

Related PR: #15174

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment