BIND 10 master, updated. fbb78097f3aca9bd8fbf4cce1f1c7169719d04e5 [master] Avoid static init fiasco in libdns++ unittests due to merge of #2390, #2656
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Feb 1 15:33:07 UTC 2013
The branch, master has been updated
via fbb78097f3aca9bd8fbf4cce1f1c7169719d04e5 (commit)
from 94df9fad7ddbe91fff09b601cfaf07fcfd346659 (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 fbb78097f3aca9bd8fbf4cce1f1c7169719d04e5
Author: Mukund Sivaraman <muks at isc.org>
Date: Fri Feb 1 19:02:32 2013 +0530
[master] Avoid static init fiasco in libdns++ unittests due to merge of #2390, #2656
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/tests/rdata_cname_unittest.cc | 11 ++++++++---
src/lib/dns/tests/rdata_dname_unittest.cc | 11 ++++++++---
src/lib/dns/tests/rdata_mx_unittest.cc | 9 ++++++---
src/lib/dns/tests/rdata_ns_unittest.cc | 11 ++++++++---
src/lib/dns/tests/rdata_ptr_unittest.cc | 11 ++++++++---
src/lib/dns/tests/rdata_srv_unittest.cc | 24 +++++++++++++++---------
6 files changed, 53 insertions(+), 24 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dns/tests/rdata_cname_unittest.cc b/src/lib/dns/tests/rdata_cname_unittest.cc
index c00cab7..5f602f0 100644
--- a/src/lib/dns/tests/rdata_cname_unittest.cc
+++ b/src/lib/dns/tests/rdata_cname_unittest.cc
@@ -33,11 +33,16 @@ using namespace isc::dns::rdata;
namespace {
class Rdata_CNAME_Test : public RdataTest {
- // there's nothing to specialize
+public:
+ Rdata_CNAME_Test() :
+ rdata_cname("cn.example.com."),
+ rdata_cname2("cn2.example.com.")
+ {}
+
+ const generic::CNAME rdata_cname;
+ const generic::CNAME rdata_cname2;
};
-const generic::CNAME rdata_cname("cn.example.com.");
-const generic::CNAME rdata_cname2("cn2.example.com.");
const uint8_t wiredata_cname[] = {
0x02, 0x63, 0x6e, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
0x63, 0x6f, 0x6d, 0x00 };
diff --git a/src/lib/dns/tests/rdata_dname_unittest.cc b/src/lib/dns/tests/rdata_dname_unittest.cc
index 5b6d9ac..7209e36 100644
--- a/src/lib/dns/tests/rdata_dname_unittest.cc
+++ b/src/lib/dns/tests/rdata_dname_unittest.cc
@@ -33,11 +33,16 @@ using namespace isc::dns::rdata;
namespace {
class Rdata_DNAME_Test : public RdataTest {
- // there's nothing to specialize
+public:
+ Rdata_DNAME_Test() :
+ rdata_dname("dn.example.com."),
+ rdata_dname2("dn2.example.com.")
+ {}
+
+ const generic::DNAME rdata_dname;
+ const generic::DNAME rdata_dname2;
};
-const generic::DNAME rdata_dname("dn.example.com.");
-const generic::DNAME rdata_dname2("dn2.example.com.");
const uint8_t wiredata_dname[] = {
0x02, 0x64, 0x6e, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
0x63, 0x6f, 0x6d, 0x00 };
diff --git a/src/lib/dns/tests/rdata_mx_unittest.cc b/src/lib/dns/tests/rdata_mx_unittest.cc
index f4d0abb..6e4eaba 100644
--- a/src/lib/dns/tests/rdata_mx_unittest.cc
+++ b/src/lib/dns/tests/rdata_mx_unittest.cc
@@ -32,10 +32,13 @@ using namespace isc::dns::rdata;
namespace {
class Rdata_MX_Test : public RdataTest {
- // there's nothing to specialize
-};
+public:
+ Rdata_MX_Test() :
+ rdata_mx(10, Name("mx.example.com"))
+ {}
-const generic::MX rdata_mx(10, Name("mx.example.com"));
+ const generic::MX rdata_mx;
+};
TEST_F(Rdata_MX_Test, createFromText) {
const generic::MX rdata_mx2("10 mx.example.com.");
diff --git a/src/lib/dns/tests/rdata_ns_unittest.cc b/src/lib/dns/tests/rdata_ns_unittest.cc
index a6f5a98..53eb670 100644
--- a/src/lib/dns/tests/rdata_ns_unittest.cc
+++ b/src/lib/dns/tests/rdata_ns_unittest.cc
@@ -33,11 +33,16 @@ using namespace isc::dns::rdata;
namespace {
class Rdata_NS_Test : public RdataTest {
- // there's nothing to specialize
+public:
+ Rdata_NS_Test() :
+ rdata_ns("ns.example.com."),
+ rdata_ns2("ns2.example.com.")
+ {}
+
+ const generic::NS rdata_ns;
+ const generic::NS rdata_ns2;
};
-const generic::NS rdata_ns("ns.example.com.");
-const generic::NS rdata_ns2("ns2.example.com.");
const uint8_t wiredata_ns[] = {
0x02, 0x6e, 0x73, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
0x63, 0x6f, 0x6d, 0x00 };
diff --git a/src/lib/dns/tests/rdata_ptr_unittest.cc b/src/lib/dns/tests/rdata_ptr_unittest.cc
index 9378c5e..5d6d37d 100644
--- a/src/lib/dns/tests/rdata_ptr_unittest.cc
+++ b/src/lib/dns/tests/rdata_ptr_unittest.cc
@@ -37,11 +37,16 @@ using namespace isc::dns::rdata;
namespace {
class Rdata_PTR_Test : public RdataTest {
- // there's nothing to specialize
+public:
+ Rdata_PTR_Test() :
+ rdata_ptr("ns.example.com."),
+ rdata_ptr2("ns2.example.com.")
+ {}
+
+ const generic::PTR rdata_ptr;
+ const generic::PTR rdata_ptr2;
};
-const generic::PTR rdata_ptr("ns.example.com.");
-const generic::PTR rdata_ptr2("ns2.example.com.");
const uint8_t wiredata_ptr[] = {
0x02, 0x6e, 0x73, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x03,
0x63, 0x6f, 0x6d, 0x00 };
diff --git a/src/lib/dns/tests/rdata_srv_unittest.cc b/src/lib/dns/tests/rdata_srv_unittest.cc
index a3d7721..6ca0c7f 100644
--- a/src/lib/dns/tests/rdata_srv_unittest.cc
+++ b/src/lib/dns/tests/rdata_srv_unittest.cc
@@ -33,14 +33,23 @@ using namespace isc::dns::rdata;
namespace {
class Rdata_SRV_Test : public RdataTest {
- // there's nothing to specialize
+public:
+ Rdata_SRV_Test() :
+ srv_txt("1 5 1500 a.example.com."),
+ srv_txt2("1 5 1400 example.com."),
+ too_long_label("012345678901234567890123456789"
+ "0123456789012345678901234567890123."),
+ rdata_srv(srv_txt),
+ rdata_srv2(srv_txt2)
+ {}
+
+ const string srv_txt;
+ const string srv_txt2;
+ const string too_long_label;
+ const in::SRV rdata_srv;
+ const in::SRV rdata_srv2;
};
-string srv_txt("1 5 1500 a.example.com.");
-string srv_txt2("1 5 1400 example.com.");
-string too_long_label("012345678901234567890123456789"
- "0123456789012345678901234567890123.");
-
// 1 5 1500 a.example.com.
const uint8_t wiredata_srv[] = {
0x00, 0x01, 0x00, 0x05, 0x05, 0xdc, 0x01, 0x61, 0x07, 0x65, 0x78,
@@ -50,9 +59,6 @@ const uint8_t wiredata_srv2[] = {
0x00, 0x01, 0x00, 0x05, 0x05, 0x78, 0x07, 0x65, 0x78, 0x61, 0x6d,
0x70, 0x6c, 0x65, 0x03, 0x63, 0x6f, 0x6d, 0x00};
-const in::SRV rdata_srv(srv_txt);
-const in::SRV rdata_srv2(srv_txt2);
-
TEST_F(Rdata_SRV_Test, createFromText) {
EXPECT_EQ(1, rdata_srv.getPriority());
EXPECT_EQ(5, rdata_srv.getWeight());
More information about the bind10-changes
mailing list