BIND 10 master, updated. c7da3e0c3ab187eb6f4293eea34f65deef0cd249 [master] make the intentional dup'ed log messages for test consistent.

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Jun 14 04:10:43 UTC 2012


The branch, master has been updated
       via  c7da3e0c3ab187eb6f4293eea34f65deef0cd249 (commit)
      from  3430cd41631b026665fe7b01bd12740e2fee9d9b (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 c7da3e0c3ab187eb6f4293eea34f65deef0cd249
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Jun 13 21:08:26 2012 -0700

    [master] make the intentional dup'ed log messages for test consistent.
    
    otherwise it might cause failure with --enable-logger-checks, depending on
    which one is initialized first (which is ultimately enviornment dependent).
    should be obvious, and also okayed on jabber.
    
    made one piggyback cleanup: use an unnamed namespace instead of file-scope
    static, and hid the initializer there, too.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/log/tests/message_dictionary_unittest.cc |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/message_dictionary_unittest.cc b/src/lib/log/tests/message_dictionary_unittest.cc
index 394fea0..b8bded3 100644
--- a/src/lib/log/tests/message_dictionary_unittest.cc
+++ b/src/lib/log/tests/message_dictionary_unittest.cc
@@ -28,16 +28,17 @@ using namespace std;
 // global dictionary is loaded, the former should be marked as a duplicate
 // and the latter should be present.
 
-static const char* values[] = {
-    "LOG_DUPLICATE_NAMESPACE", "duplicate $NAMESPACE directive found",
+namespace {
+const char* values[] = {
+    // This message for DUPLICATE_NAMESPACE must be copied from
+    // ../log_messages.mes; otherwise logger check might fail.
+    "LOG_DUPLICATE_NAMESPACE", "line %1: duplicate $NAMESPACE directive found",
     "NEWSYM", "new symbol added",
     NULL
 };
 
 MessageInitializer init(values);
-
-
-
+}
 
 class MessageDictionaryTest : public ::testing::Test {
 protected:



More information about the bind10-changes mailing list