fly/flightgear
1
0
Fork 0
Code Activity

TestSuite: Minor output formatting changes and disabling of the GUI tests.

Browse source 
The GUI tests are disabled as there are no such tests yet.
This commit is contained in:
Edward d'Auvergne 2018-06-20 11:29:29 +02:00
parent ab36c9760d
commit 688f0b5ea0
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test_suite/fgTestRunner.cxx
View file

@ -29,7 +29,7 @@
// Execute all test suites for the given test category.
int testRunner(const std::string& title, char *subset, bool verbose, bool ctest_output, bool debug)
int testRunner(const std::string& type, const std::string& title, char *subset, bool verbose, bool ctest_output, bool debug)
{
// Declarations.
CppUnit::TextTestRunner runner;
@ -39,7 +39,7 @@ int testRunner(const std::string& title, char *subset, bool verbose, bool ctest_
printTitle(std::cerr, title);
// Get all tests.
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry(title).makeTest());
runner.addTest(CppUnit::TestFactoryRegistry::getRegistry(type).makeTest());
// Set up the test listener.
fgTestListener *testListener;

2
test_suite/fgTestRunner.hxx
View file

@ -23,7 +23,7 @@
// Execute all test suites for the given test category.
int testRunner(const std::string&, char*, bool, bool, bool);
int testRunner(const std::string&, const std::string&, char*, bool, bool, bool);
#endif // _FG_TEST_RUNNER_HXX

6
test_suite/formatting.cxx
View file

@ -76,7 +76,7 @@ void printTitle(CppUnit::OStream &stream, const string &text)
// Format the text.
stream << endl << endl;
stream << string(width, '#') << endl;
stream << "# " << text << " #" << endl;
stream << string(width, '#') << endl << endl;
stream << string(width, '=') << endl;
stream << "= " << text << " =" << endl;
stream << string(width, '=') << endl << endl;
}

10
test_suite/testSuite.cxx
View file

@ -201,13 +201,13 @@ int main(int argc, char **argv)
// Execute each of the test suite categories.
if (run_system)
status_system = testRunner("System tests", subset_system, verbose, ctest_output, debug);
status_system = testRunner("System tests", "System / functional tests", subset_system, verbose, ctest_output, debug);
if (run_unit)
status_unit = testRunner("Unit tests", subset_unit, verbose, ctest_output, debug);
if (run_gui)
status_gui = testRunner("GUI tests", subset_gui, verbose, ctest_output, debug);
status_unit = testRunner("Unit tests", "Unit tests", subset_unit, verbose, ctest_output, debug);
if (run_gui && 0) // Disabled as there are no GUI tests yet.
status_gui = testRunner("GUI tests", "GUI tests", subset_gui, verbose, ctest_output, debug);
if (run_simgear)
status_simgear = testRunner("Simgear unit tests", subset_simgear, verbose, ctest_output, debug);
status_simgear = testRunner("Simgear unit tests", "Simgear unit tests", subset_simgear, verbose, ctest_output, debug);
// Summary printout.
if (printSummary && !ctest_output)