BIND 10 master, updated. bb7465ef1ba3853c069c44f8f1ab6491782fcd5f [master] Corrected a build failure under Googletest 1.4 in D2 unit test.

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Jul 11 10:57:59 UTC 2013


The branch, master has been updated
       via  bb7465ef1ba3853c069c44f8f1ab6491782fcd5f (commit)
      from  465c3330313daf9f80471056dc41eb53eaaa3531 (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 bb7465ef1ba3853c069c44f8f1ab6491782fcd5f
Author: Thomas Markwalder <tmark at isc.org>
Date:   Thu Jul 11 05:54:27 2013 -0400

    [master] Corrected a build failure under Googletest 1.4
    in D2 unit test.

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

Summary of changes:
 src/bin/d2/tests/d_test_stubs.h |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/d2/tests/d_test_stubs.h b/src/bin/d2/tests/d_test_stubs.h
index 58ebcd4..99670de 100644
--- a/src/bin/d2/tests/d_test_stubs.h
+++ b/src/bin/d2/tests/d_test_stubs.h
@@ -608,11 +608,12 @@ public:
         try  {
             config_set_ = isc::data::Element::fromJSON(json_text);
         } catch (const isc::Exception &ex) {
-            return  ::testing::AssertionFailure() 
-                << "JSON text failed to parse:" << ex.what();
+            return (::testing::AssertionFailure(::testing::Message() << 
+                                                "JSON text failed to parse:" 
+                                                << ex.what())); 
         }
 
-        return ::testing::AssertionSuccess();
+        return (::testing::AssertionSuccess());
     }
 
 
@@ -628,11 +629,12 @@ public:
         isc::data::ConstElementPtr comment;
         comment = isc::config::parseAnswer(rcode, answer_);
         if (rcode == should_be) {
-            return testing::AssertionSuccess();
+            return (testing::AssertionSuccess());
         }
 
-        return ::testing::AssertionFailure() << "checkAnswer rcode:" 
-               << rcode << " comment: " << *comment;
+        return (::testing::AssertionFailure(::testing::Message() << 
+                                            "checkAnswer rcode:" << rcode 
+                                            << " comment: " << *comment));
     }
 
     /// @brief Configuration set being tested.



More information about the bind10-changes mailing list