From 875f82b1b6bd918566b77e0968c49372658144fc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 26 Mar 2009 15:31:54 +0000 Subject: [PATCH] switch off logging sooner (closes #10646) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59866 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/test.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tests/test.cpp b/tests/test.cpp index 62e04b129b..077a95829c 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -376,24 +376,34 @@ extern void SetProcessEventFunc(ProcessEventFunc func) // int TestApp::OnRun() { +#if wxUSE_LOG + // Switch off logging unless --verbose + bool verbose = wxLog::GetVerbose(); + wxLog::EnableLogging(verbose); +#else + bool verbose = false; +#endif + CppUnit::TextTestRunner runner; for (size_t i = 0; i < m_registries.size(); i++) { wxString reg = m_registries[i]; - if (!reg.empty() && !reg.EndsWith("TestCase")) - reg += "TestCase"; // allow the user to specify the name of the testcase "in short form" // (all wx test cases end with TestCase postfix) + if (!reg.empty() && !reg.EndsWith("TestCase")) + reg += "TestCase"; + + string stdreg(reg.mb_str()); auto_ptr test(reg.empty() ? TestFactoryRegistry::getRegistry().makeTest() : - TestFactoryRegistry::getRegistry(string(reg.mb_str())).makeTest()); + TestFactoryRegistry::getRegistry(stdreg).makeTest()); TestSuite *suite = dynamic_cast(test.get()); if (suite && suite->countTestCases() == 0) - wxLogError(_T("No such test suite: %s"), reg); + cerr << "No such test suite: " << stdreg << endl; else if (m_list) List(test.get()); else @@ -405,14 +415,6 @@ int TestApp::OnRun() runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout)); -#if wxUSE_LOG - // Switch off logging unless --verbose - bool verbose = wxLog::GetVerbose(); - wxLog::EnableLogging(verbose); -#else - bool verbose = false; -#endif - // there is a bug // (http://sf.net/tracker/index.php?func=detail&aid=1649369&group_id=11795&atid=111795) // in some versions of cppunit: they write progress dots to cout (and not -- 2.45.2