From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Mon, 13 May 2013 12:10:17 +0000 (+0200)
Subject: [2836] Disable tests without shared memory
X-Git-Tag: bind10-1.2.0beta1-release~457^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd04d06c2d51af45ed818e90ef500936dafca1c4;p=thirdparty%2Fkea.git

[2836] Disable tests without shared memory

Disable tests using the shared memory utilities (eg. mapped segment)
when there's no shared memory support.
---

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 1c21766371..70d331e08c 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 016df0d14c..ed677d2e2f 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.