MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:October 2 2009 7:59am
Subject:bzr commit into mysql-6.0-codebase-bugfixing branch (tor.didriksen:3638)
View as plain text  
#At file:///export/home/didrik/mysqldev-6.0-codebase/6.0-codebase-bf-gtest/my-6.0-codebase-bugfixing-gtest/ based on revid:tor.didriksen@stripped

 3638 Tor Didriksen	2009-10-02
      EventListeners has been renamed to TestEventListeners. Do MY_INIT() earlier.

    modified:
      sql/gunit_test_main.cc
      sql/tap_event_listener.cc
=== modified file 'sql/gunit_test_main.cc'
--- a/sql/gunit_test_main.cc	2009-09-30 13:19:09 +0000
+++ b/sql/gunit_test_main.cc	2009-10-02 07:59:18 +0000
@@ -70,6 +70,7 @@ extern void install_tap_listener();
 
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
+  MY_INIT(argv[0]);
 
   if (handle_unittest_options(&argc, &argv))
     return EXIT_FAILURE;
@@ -78,6 +79,5 @@ int main(int argc, char **argv) {
   if (opt_help)
     print_usage();
 
-  MY_INIT(argv[0]);
   return RUN_ALL_TESTS();
 }

=== modified file 'sql/tap_event_listener.cc'
--- a/sql/tap_event_listener.cc	2009-10-01 11:35:36 +0000
+++ b/sql/tap_event_listener.cc	2009-10-02 07:59:18 +0000
@@ -17,7 +17,7 @@
 #include <stdarg.h>
 #include <string>
 
-using testing::EventListeners;
+using testing::TestEventListeners;
 using testing::TestCase;
 using testing::TestEventListener;
 using testing::TestInfo;
@@ -274,7 +274,7 @@ void TapEventListener::OnTestIterationEn
  */
 void install_tap_listener()
 {
-  EventListeners& listeners = UnitTest::GetInstance()->listeners();
+  TestEventListeners& listeners = UnitTest::GetInstance()->listeners();
   delete listeners.Release(listeners.default_result_printer());
   listeners.Append(new TapEventListener);
 }


Attachment: [text/bzr-bundle] bzr/tor.didriksen@sun.com-20091002075918-gsmwes2sikzexjkp.bundle
Thread
bzr commit into mysql-6.0-codebase-bugfixing branch (tor.didriksen:3638) Tor Didriksen2 Oct