BIND 10 trac2836, updated. d35ac0a1d9375ec6e4c01db0d2107ecf177b7ab8 [2836] make tests safer when USE_SHARED_MEMORY is undefined.
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed May 15 16:41:21 UTC 2013
The branch, trac2836 has been updated
via d35ac0a1d9375ec6e4c01db0d2107ecf177b7ab8 (commit)
from ac01dfd069e66c85409e93b40385a393bb5c5a59 (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 d35ac0a1d9375ec6e4c01db0d2107ecf177b7ab8
Author: JINMEI Tatuya <jinmei at isc.org>
Date: Wed May 15 09:40:07 2013 -0700
[2836] make tests safer when USE_SHARED_MEMORY is undefined.
- explicitly include config.h in these tests
- move helper function only used with USE_SHARED_MEMORY inside the ifdef block
-----------------------------------------------------------------------
Summary of changes:
.../auth/tests/datasrc_clients_builder_unittest.cc | 2 ++
src/lib/datasrc/tests/client_list_unittest.cc | 2 ++
.../tests/memory/segment_object_holder_unittest.cc | 4 +++-
.../tests/memory/zone_data_updater_unittest.cc | 2 ++
4 files changed, 9 insertions(+), 1 deletion(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/datasrc_clients_builder_unittest.cc b/src/bin/auth/tests/datasrc_clients_builder_unittest.cc
index 5a24b30..8aa223b 100644
--- a/src/bin/auth/tests/datasrc_clients_builder_unittest.cc
+++ b/src/bin/auth/tests/datasrc_clients_builder_unittest.cc
@@ -12,6 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
+
#include <util/unittests/check_valgrind.h>
#include <dns/name.h>
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index 745654c..f57aa30 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -12,6 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
+
#include <datasrc/client_list.h>
#include <datasrc/client.h>
#include <datasrc/cache_config.h>
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 f0134e8..73aa18b 100644
--- a/src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
+++ b/src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
@@ -12,6 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
+
#include <util/memory_segment_local.h>
#include <util/memory_segment_mapped.h>
@@ -83,6 +85,7 @@ TEST(SegmentObjectHolderTest, destroyNotSet) {
EXPECT_TRUE(sgmt.allMemoryDeallocated());
}
+#ifdef USE_SHARED_MEMORY
// Keep allocating bigger and bigger chunks of data until the allocation
// fails with growing the segment.
void
@@ -103,7 +106,6 @@ 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) {
MemorySegmentMapped segment(mapped_file,
isc::util::MemorySegmentMapped::CREATE_ONLY);
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 aed66c1..f3e814a 100644
--- a/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_data_updater_unittest.cc
@@ -12,6 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <config.h>
+
#include <datasrc/memory/zone_data_updater.h>
#include <datasrc/memory/rdataset.h>
#include <datasrc/memory/zone_data.h>
More information about the bind10-changes
mailing list