diff --git a/test_suite/fgTestListener.cxx b/test_suite/fgTestListener.cxx index 160fe1d45..c87fb7ffa 100644 --- a/test_suite/fgTestListener.cxx +++ b/test_suite/fgTestListener.cxx @@ -59,8 +59,8 @@ void fgTestListener::endTest(CppUnit::Test *test) else cerr << '.'; - // Verbose output. - if (verbose || ctest_output || debug) { + // Timing output. + if (timings || ctest_output || debug) { // Test timing. float time = ((float)(clock()-m_time))/CLOCKS_PER_SEC; char buffer[100]; diff --git a/test_suite/fgTestListener.hxx b/test_suite/fgTestListener.hxx index afe029d50..c3b0090b2 100644 --- a/test_suite/fgTestListener.hxx +++ b/test_suite/fgTestListener.hxx @@ -84,7 +84,7 @@ protected: std::vector io_capt; // Output settings. - bool verbose; + bool timings; bool ctest_output; bool debug; diff --git a/test_suite/fgTestRunner.cxx b/test_suite/fgTestRunner.cxx index 3fda79b6d..d329215cd 100644 --- a/test_suite/fgTestRunner.cxx +++ b/test_suite/fgTestRunner.cxx @@ -29,7 +29,7 @@ // Execute all test suites for the given test category. -int testRunner(const std::string& type, 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 timings, bool ctest_output, bool debug) { // Declarations. CppUnit::TextTestRunner runner; @@ -45,7 +45,7 @@ int testRunner(const std::string& type, const std::string& title, char *subset, fgTestListener *testListener; testListener = new fgTestListener; runner.eventManager().addListener(testListener); - testListener->verbose = verbose; + testListener->timings = timings; testListener->ctest_output = ctest_output; testListener->debug = debug; diff --git a/test_suite/testSuite.cxx b/test_suite/testSuite.cxx index f0179d080..a941f0dca 100644 --- a/test_suite/testSuite.cxx +++ b/test_suite/testSuite.cxx @@ -92,7 +92,7 @@ int main(int argc, char **argv) int status_gui=-1, status_simgear=-1, status_system=-1, status_unit=-1, status_fgdata=-1; bool run_system=false, run_unit=false, run_gui=false, run_simgear=false, run_fgdata=false; bool logSplit=false; - bool verbose=false, ctest_output=false, debug=false, printSummary=true, help=false; + bool timings=false, ctest_output=false, debug=false, printSummary=true, help=false; char *subset_system=NULL, *subset_unit=NULL, *subset_gui=NULL, *subset_simgear=NULL, *subset_fgdata=NULL; char firstchar; std::string arg, delim, fgRoot, logClassVal, logClassItem, logLevel, val; @@ -261,9 +261,9 @@ int main(int argc, char **argv) } else if (arg == "--log-split") { logSplit = true; - // Verbose output. - } else if (arg == "-v" || arg == "--verbose") { - verbose = true; + // Timing output. + } else if (arg == "-t" || arg == "--timings") { + timings = true; // CTest suitable output. } else if (arg == "-c" || arg == "--ctest") { @@ -322,7 +322,7 @@ int main(int argc, char **argv) std::cout << " sequentially" << std::endl; std::cout << std::endl; std::cout << " Verbosity options:" << std::endl; - std::cout << " -v, --verbose verbose output including names and timings for all" << std::endl; + std::cout << " -t, --timings verbose output including names and timings for all" << std::endl; std::cout << " tests." << std::endl; std::cout << " -c, --ctest simplified output suitable for running via CTest." << std::endl; std::cout << " -d, --debug disable IO capture for debugging (super verbose output)." << std::endl; @@ -358,15 +358,15 @@ int main(int argc, char **argv) // Execute each of the test suite categories. if (run_system) - status_system = testRunner("System tests", "System / functional tests", subset_system, verbose, ctest_output, debug); + status_system = testRunner("System tests", "System / functional tests", subset_system, timings, ctest_output, debug); if (run_unit) - status_unit = testRunner("Unit tests", "Unit tests", subset_unit, verbose, ctest_output, debug); + status_unit = testRunner("Unit tests", "Unit tests", subset_unit, timings, 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); + status_gui = testRunner("GUI tests", "GUI tests", subset_gui, timings, ctest_output, debug); if (run_simgear) - status_simgear = testRunner("Simgear unit tests", "Simgear unit tests", subset_simgear, verbose, ctest_output, debug); + status_simgear = testRunner("Simgear unit tests", "Simgear unit tests", subset_simgear, timings, ctest_output, debug); if (run_fgdata) - status_fgdata = testRunner("FGData tests", "FGData tests", subset_fgdata, verbose, ctest_output, debug); + status_fgdata = testRunner("FGData tests", "FGData tests", subset_fgdata, timings, ctest_output, debug); // Summary printout. if (printSummary && !ctest_output)