BIND 10 trac2836, updated. bd04d06c2d51af45ed818e90ef500936dafca1c4 [2836] Disable tests without shared memory
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon May 13 12:12:37 UTC 2013
The branch, trac2836 has been updated
via bd04d06c2d51af45ed818e90ef500936dafca1c4 (commit)
from 44160bfeffd56f5ccd6c8400eb8c3e883ac10b19 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit bd04d06c2d51af45ed818e90ef500936dafca1c4
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date: Mon May 13 14:10:17 2013 +0200
[2836] Disable tests without shared memory
Disable tests using the shared memory utilities (eg. mapped segment)
when there's no shared memory support.
-----------------------------------------------------------------------
Summary of changes:
.../tests/memory/segment_object_holder_unittest.cc | 4 ++++
.../tests/memory/zone_data_updater_unittest.cc | 2 ++
2 files changed, 6 insertions(+)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc b/src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
index 1c21766..70d331e 100644
--- a/src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
+++ b/src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
@@ -88,7 +88,11 @@ allocateUntilGrows(MemorySegment& segment, size_t& current_size) {
// Check that the segment thing releases stuff even in case it throws
// SegmentGrown exception and the thing moves address
+#ifdef USE_SHARED_MEMORY
TEST(SegmentObjectHolderTest, grow) {
+#else
+TEST(SegmentObjectHolderTest, DISABLED_grow) {
+#endif
MemorySegmentMapped segment(mapped_file,
isc::util::MemorySegmentMapped::CREATE_ONLY);
// Allocate a bit of memory, to get a unique address
diff --git a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
index 016df0d..ed677d2 100644
--- a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
@@ -163,6 +163,7 @@ private:
const size_t initial_size_;
};
+#ifdef USE_SHARED_MEMORY
// There should be no initialization fiasco there. We only set int value inside
// and don't use it until the create() is called.
MappedSegmentCreator small_creator(4092), default_creator;
@@ -170,6 +171,7 @@ MappedSegmentCreator small_creator(4092), default_creator;
INSTANTIATE_TEST_CASE_P(MappedSegment, ZoneDataUpdaterTest, ::testing::Values(
static_cast<SegmentCreator*>(&small_creator),
static_cast<SegmentCreator*>(&default_creator)));
+#endif
TEST_P(ZoneDataUpdaterTest, bothNull) {
// At least either covered RRset or RRSIG must be non NULL.
More information about the bind10-changes
mailing list