]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] avoid compile mapped-segment dependent code if !USE_SHARED_MEMORY
authorJINMEI Tatuya <jinmei@isc.org>
Mon, 20 May 2013 23:24:14 +0000 (23:24 +0000)
committerJINMEI Tatuya <jinmei@isc.org>
Mon, 20 May 2013 23:24:14 +0000 (23:24 +0000)
okayed on jabber.

src/lib/datasrc/tests/memory/zone_data_loader_unittest.cc

index bfd79a5815486093f67e94c81d1d582f37ccff60..ad20d430d905841ebd2be0199c6c75b3425b28bc 100644 (file)
@@ -24,7 +24,9 @@
 #include <dns/name.h>
 #include <dns/rrclass.h>
 #include <dns/rdataclass.h>
+#ifdef USE_SHARED_MEMORY
 #include <util/memory_segment_mapped.h>
+#endif
 #include <util/memory_segment_local.h>
 
 #include <datasrc/tests/memory/memory_segment_mock.h>
 
 using namespace isc::dns;
 using namespace isc::datasrc::memory;
+#ifdef USE_SHARED_MEMORY
 using isc::util::MemorySegmentMapped;
+#endif
 using isc::datasrc::memory::detail::SegmentObjectHolder;
 
 namespace {
 
-const char* const mapped_file = TEST_DATA_BUILDDIR "/test.mapped";
-
 class ZoneDataLoaderTest : public ::testing::Test {
 protected:
     ZoneDataLoaderTest() : zclass_(RRClass::IN()), zone_data_(NULL) {}
@@ -84,7 +86,10 @@ TEST_F(ZoneDataLoaderTest, zoneMinTTL) {
 
 // Load bunch of small zones, hoping some of the relocation will happen
 // during the memory creation, not only Rdata creation.
+// Note: this doesn't even compile unless USE_SHARED_MEMORY is defined.
+#ifdef USE_SHARED_MEMORY
 TEST(ZoneDataLoaterTest, relocate) {
+    const char* const mapped_file = TEST_DATA_BUILDDIR "/test.mapped";
     MemorySegmentMapped segment(mapped_file,
                                 isc::util::MemorySegmentMapped::CREATE_ONLY,
                                 4096);
@@ -108,5 +113,6 @@ TEST(ZoneDataLoaterTest, relocate) {
     EXPECT_TRUE(segment.allMemoryDeallocated());
     EXPECT_EQ(0, unlink(mapped_file));
 }
+#endif
 
 }