Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disable FTPTestCase by default.

Browse Source 
Add a warning for the user when running --list without arguments: not all tests are listed, only those enabled by default (e.g. FTPTestCase doesn't appear there)!


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2010-06-02 10:49:44 +00:00
parent 87b3708781
commit 20ba398d1a
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test.cpp
View File

@@ -441,7 +441,7 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
"print the test case names, run them", "print the test case names, run them",
wxCMD_LINE_VAL_NONE, 0 }, wxCMD_LINE_VAL_NONE, 0 },
{ wxCMD_LINE_SWITCH, "t", "timing", { wxCMD_LINE_SWITCH, "t", "timing",
"print names and mesure running time of individual test, run them", "print names and measure running time of individual test, run them",
wxCMD_LINE_VAL_NONE, 0 }, wxCMD_LINE_VAL_NONE, 0 },
{ wxCMD_LINE_OPTION, "", "locale", { wxCMD_LINE_OPTION, "", "locale",
"locale to use when running the program", "locale to use when running the program",
@@ -530,8 +530,17 @@ int TestApp::OnRun()
if ( m_registries.empty() ) if ( m_registries.empty() )
{ {
// run or list all tests // run or list all tests which use the CPPUNIT_TEST_SUITE_REGISTRATION() macro
// (i.e. those registered in the "All tests" registry); if there are other
// tests not registered with the CPPUNIT_TEST_SUITE_REGISTRATION() macro
// then they won't be listed/run!
AddTest(runner, TestFactoryRegistry::getRegistry().makeTest()); AddTest(runner, TestFactoryRegistry::getRegistry().makeTest());
if (m_list)
{
cout << "\nNote that the list above is not complete as it doesn't include the \n";
cout << "tests disabled by default.\n";
}
} }
else // run only the selected tests else // run only the selected tests
{ {

5
tests/uris/ftp.cpp
View File

@@ -75,8 +75,9 @@ private:
DECLARE_NO_COPY_CLASS(FTPTestCase) DECLARE_NO_COPY_CLASS(FTPTestCase)
}; };
// register in the unnamed registry so that these tests are run by default // NOTE: we do not run FTPTestCase suite by default because buildslaves typically
CPPUNIT_TEST_SUITE_REGISTRATION( FTPTestCase ); // do not have FTP connectivity enabled by default...
//CPPUNIT_TEST_SUITE_REGISTRATION( FTPTestCase );
// also include in it's own registry so that these tests can be run alone // also include in it's own registry so that these tests can be run alone
CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FTPTestCase, "FTPTestCase" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( FTPTestCase, "FTPTestCase" );