Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adam Osuchowski
Kea
Commits
2500db66
Commit
2500db66
authored
May 20, 2013
by
JINMEI Tatuya
Browse files
[master] avoid compile mapped-segment dependent code if !USE_SHARED_MEMORY
okayed on jabber.
parent
45d2c5e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/lib/datasrc/tests/memory/zone_data_loader_unittest.cc
View file @
2500db66
...
...
@@ -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>
...
...
@@ -33,13 +35,13 @@
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
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment