test/ceph-test-objectstore: Don't always include BlueStore code #13516
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tchaikov
requested changes
Feb 18, 2017
src/test/objectstore/store_test.cc
Outdated
| @@ -5901,7 +5909,9 @@ TEST_P(StoreTest, garbageCollection) { | |||
| ASSERT_EQ(r, 0); | |||
| ASSERT_EQ(statfs.compressed_allocated, 0x20000); | |||
| const PerfCounters* counters = store->get_perf_counters(); | |||
| #if defined(HAVE_LIBAIO) | |||
There was a problem hiding this comment.
this test is only valid with bluestore, could just quote it using #ifdef HAVE_LIBAIO
There was a problem hiding this comment.
@tchaikov
I'm not following you??
What's the diff between #ifdef`` and #if defined(...)` you are trying to make?
There was a problem hiding this comment.
@wjwithagen no, i mean the whole test of StoreTest.garbageCollection is bluestore specific, you can guard it like
#ifdef HAVE_LIBAIO
TEST_P(StoreTest, garbageCollection) {
// ...
}the #ifdef versus #if defined() is but person preference. i am good either way.
There was a problem hiding this comment.
@tchaikov
Ah right, would make a lot less mess in the code.
Will fix.
- FreBSD does not do Bluestore, so TESTS added using BlueStore need to be conditional on HAVE_LIBAIO Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wip-wjw-test-onjectstore
branch
from
0151d01
to
e30140d
Compare
tchaikov
approved these changes
Feb 19, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BlueStore need to be conditional on HAVE_LIBAIO
Signed-off-by: Willem Jan Withagen wjw@digiware.nl