2018-03-25 12:18:24 +00:00
|
|
|
# CMake module includes.
|
2018-03-25 12:29:02 +00:00
|
|
|
include(SetupFGFSEmbeddedResources)
|
2018-03-25 12:18:24 +00:00
|
|
|
include(SetupFGFSLibraries)
|
|
|
|
|
2016-01-28 15:56:10 +00:00
|
|
|
# Add each test suite category.
|
|
|
|
foreach(test_category
|
|
|
|
gui_tests
|
|
|
|
simgear_tests
|
|
|
|
system_tests
|
|
|
|
unit_tests
|
|
|
|
)
|
|
|
|
add_subdirectory(${test_category})
|
|
|
|
endforeach(test_category)
|
|
|
|
|
2018-03-13 19:56:31 +00:00
|
|
|
# Add the helpers.
|
|
|
|
add_subdirectory(helpers)
|
|
|
|
|
2016-01-28 15:56:10 +00:00
|
|
|
# Add all test suite sources and headers.
|
|
|
|
set(TESTSUITE_SOURCES
|
|
|
|
${TESTSUITE_SOURCES}
|
|
|
|
bootstrap.cxx
|
TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
fgCompilerOutputter.cxx
|
|
|
|
fgTestListener.cxx
|
2016-01-28 15:56:10 +00:00
|
|
|
fgTestRunner.cxx
|
TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
formatting.cxx
|
2016-02-12 18:42:20 +00:00
|
|
|
logging.cxx
|
2016-01-28 15:56:10 +00:00
|
|
|
testSuite.cxx
|
|
|
|
)
|
|
|
|
set(TESTSUITE_HEADERS
|
|
|
|
${TESTSUITE_HEADERS}
|
TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
fgCompilerOutputter.hxx
|
|
|
|
fgTestListener.hxx
|
2016-01-28 15:56:10 +00:00
|
|
|
fgTestRunner.hxx
|
TestSuite: Custom output formatting.
A large number of improvements have been made by subclassing the CppUnit classes
and overriding the base functions, including CompilerOutputter, TestListener,
and TextTestRunner. All IO has also been captured by the test runner.
The result is that during the test suite run, only the characters '.', 'F', and
'E' are output for a pass, failure and error state. At the end of each test
suite category, all failures and errors are reported in full detail, including
the different captured IO streams. A final synopsis is printed out, improving
the overview in the case of too many tests failing.
For the fgCompilerOutputter class, the printSuccess(), printFailureReport(),
printFailureDetail(), and printSuiteStats() functions have been replaced to
implement the above printout design. The class also stores the std::vector of
TestIOCapt structures for the final printouts.
The fgTestListener class handles the events from the running of the test suite.
The startTest() and endTest() functions are used for IO capture. The IO is
placed into a TestIOCapt data structure, with one std::string for holding the
combined STDOUT and STDERR IO, and another for the SG_LOG IO. If failures
occur, the TestIOCapt structure is appended to the fgCompilerOutputter vector.
The startTest() and endTest() functions are also used for starting and stopping
a timer to allow the full test suite to be timed. And the addFailure() function
simply registers test failures or errors.
The fgTestRunner class overrides the CppUnit::TextTestRunner::run() function,
simply to prevent the base method from spawning a second test listener, causing
the test output to be duplicated.
Some auxiliary formatting functions have been added to print out titles,
sections, and synopsis summary lines.
2016-02-09 16:34:56 +00:00
|
|
|
formatting.hxx
|
2016-02-12 18:42:20 +00:00
|
|
|
logging.hxx
|
2016-01-28 15:56:10 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
# The test suite output directory.
|
|
|
|
set(TESTSUITE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
|
|
|
|
|
2018-03-06 10:08:15 +00:00
|
|
|
# Get the CppUnit sources and headers to be built into the test suite.
|
|
|
|
if (NOT SYSTEM_CPPUNIT)
|
|
|
|
message(STATUS "CppUnit: Building the FlightGear supplied CppUnit library")
|
|
|
|
|
|
|
|
get_property(CPPUNIT_SOURCES GLOBAL PROPERTY CPPUNIT_SOURCES)
|
|
|
|
get_property(CPPUNIT_HEADERS GLOBAL PROPERTY CPPUNIT_HEADERS)
|
|
|
|
|
|
|
|
include_directories("${PROJECT_SOURCE_DIR}/3rdparty/cppunit/include")
|
|
|
|
|
|
|
|
add_library(CppUnitLib STATIC ${CPPUNIT_SOURCES} ${CPPUNIT_HEADERS})
|
|
|
|
set(CPPUNIT_LIBRARIES CppUnitLib)
|
|
|
|
else()
|
|
|
|
message(STATUS "CppUnit: Linking to the system supplied CppUnit library")
|
|
|
|
endif()
|
|
|
|
|
2018-03-12 10:43:24 +00:00
|
|
|
#-----------------------------------------------------------------------------
|
|
|
|
# Set up all test suites as CTests.
|
|
|
|
|
|
|
|
# System test suites.
|
|
|
|
|
|
|
|
# Unit test suites.
|
2018-03-13 09:37:44 +00:00
|
|
|
add_test(AddonManagementUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u AddonManagementTests)
|
2018-03-12 10:43:24 +00:00
|
|
|
add_test(FlightplanUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u FlightplanTests)
|
2018-03-13 08:57:27 +00:00
|
|
|
add_test(LaRCSimMatrixUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u LaRCSimMatrixTests)
|
2018-03-12 10:43:24 +00:00
|
|
|
add_test(MktimeUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u MktimeTests)
|
|
|
|
add_test(NasalSysUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u NasalSysTests)
|
2018-03-13 10:10:08 +00:00
|
|
|
add_test(PosInitUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -u PosInitTests)
|
2018-03-12 10:43:24 +00:00
|
|
|
|
|
|
|
# GUI test suites.
|
|
|
|
|
|
|
|
# Simgear unit test suites.
|
|
|
|
add_test(MathGeodesySimgearUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -m MathGeodesyTests)
|
|
|
|
add_test(SimgearPropsSimgearUnitTests ${TESTSUITE_OUTPUT_DIR}/run_test_suite --ctest -m SimgearPropsTests)
|
|
|
|
|
2016-01-28 15:56:10 +00:00
|
|
|
#-----------------------------------------------------------------------------
|
|
|
|
# From here on, this is a modified copy of src/Main/CMakeLists.txt. This is
|
|
|
|
# designed to have a minimal diff so that this can be updated together with the
|
|
|
|
# main CMakeLists.txt file.
|
|
|
|
|
|
|
|
# Set up the Main FG file sources and headers (excluding bootstrap.cxx and its main() function).
|
|
|
|
if(MSVC)
|
|
|
|
set(RESOURCE_FILE ${PROJECT_SOURCE_DIR}/src/Main/flightgear.rc)
|
|
|
|
endif(MSVC)
|
|
|
|
|
|
|
|
set(MAIN_SOURCES
|
|
|
|
#${PROJECT_SOURCE_DIR}/src/Main/bootstrap.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_commands.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_init.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_io.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_os_common.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_scene_commands.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_props.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/FGInterpolator.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/globals.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/locale.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/logger.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/main.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/options.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/positioninit.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/screensaver_control.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/subsystemFactory.cxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/util.cxx
|
|
|
|
${RESOURCE_FILE}
|
|
|
|
)
|
|
|
|
|
|
|
|
set(MAIN_HEADERS
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/AircraftDirVisitorBase.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_commands.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_init.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_io.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/fg_props.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/FGInterpolator.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/globals.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/locale.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/logger.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/main.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/options.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/positioninit.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/screensaver_control.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/subsystemFactory.hxx
|
|
|
|
${PROJECT_SOURCE_DIR}/src/Main/util.hxx
|
|
|
|
)
|
|
|
|
|
2018-03-25 12:29:02 +00:00
|
|
|
# Set up the embedded resources.
|
|
|
|
setup_fgfs_embedded_resources()
|
2016-01-28 15:56:10 +00:00
|
|
|
|
2018-03-25 12:29:02 +00:00
|
|
|
# All sources and headers to be built into the test suite.
|
2016-01-28 15:56:10 +00:00
|
|
|
get_property(FG_SOURCES GLOBAL PROPERTY FG_SOURCES)
|
|
|
|
get_property(FG_HEADERS GLOBAL PROPERTY FG_HEADERS)
|
2018-03-25 12:29:02 +00:00
|
|
|
get_property(EMBEDDED_RESOURCE_SOURCES GLOBAL PROPERTY EMBEDDED_RESOURCE_SOURCES)
|
|
|
|
get_property(EMBEDDED_RESOURCE_HEADERS GLOBAL PROPERTY EMBEDDED_RESOURCE_HEADERS)
|
2016-01-28 15:56:10 +00:00
|
|
|
|
|
|
|
# Set up the source groups.
|
|
|
|
get_property(FG_GROUPS_C GLOBAL PROPERTY FG_GROUPS_C)
|
|
|
|
string(REPLACE "@" ";" groups ${FG_GROUPS_C} )
|
|
|
|
foreach(g ${groups})
|
|
|
|
string(REPLACE "#" ";" g2 ${g})
|
|
|
|
list(GET g2 0 name)
|
|
|
|
list(REMOVE_AT g2 0)
|
|
|
|
source_group("${name}\\Sources" FILES ${g2})
|
|
|
|
endforeach()
|
|
|
|
|
|
|
|
# Set up the header groups.
|
|
|
|
get_property(FG_GROUPS_H GLOBAL PROPERTY FG_GROUPS_H)
|
|
|
|
string(REPLACE "@" ";" groups ${FG_GROUPS_H} )
|
|
|
|
foreach(g ${groups})
|
|
|
|
string(REPLACE "#" ";" g2 ${g})
|
|
|
|
list(GET g2 0 name)
|
|
|
|
list(REMOVE_AT g2 0)
|
|
|
|
source_group("${name}\\Headers" FILES ${g2})
|
|
|
|
endforeach()
|
|
|
|
|
|
|
|
source_group("Main\\Headers" FILES ${HEADERS})
|
|
|
|
source_group("Main\\Sources" FILES ${SOURCES})
|
|
|
|
|
|
|
|
# Set up the separate executable for running the test suite.
|
|
|
|
add_executable(run_test_suite
|
|
|
|
${FG_SOURCES}
|
|
|
|
${FG_HEADERS}
|
2018-03-25 12:29:02 +00:00
|
|
|
${EMBEDDED_RESOURCE_SOURCES}
|
|
|
|
${EMBEDDED_RESOURCE_HEADERS}
|
2016-01-28 15:56:10 +00:00
|
|
|
${MAIN_SOURCES}
|
|
|
|
${MAIN_HEADERS}
|
|
|
|
${TESTSUITE_SOURCES}
|
|
|
|
${TESTSUITE_HEADERS}
|
|
|
|
)
|
|
|
|
set_target_properties(run_test_suite
|
|
|
|
PROPERTIES
|
|
|
|
RUNTIME_OUTPUT_DIRECTORY "${TESTSUITE_OUTPUT_DIR}"
|
|
|
|
)
|
2018-03-16 10:28:18 +00:00
|
|
|
if(ENABLE_AUTOTESTING)
|
|
|
|
set(TEST_SUITE_COMMENT "Running the full FlightGear test suite.")
|
|
|
|
if(WIN32)
|
|
|
|
set(TEST_SUITE_COMMAND "run_test_suite.exe")
|
|
|
|
set(TEST_SUITE_WORKING_DIRECTORY "${TESTSUITE_OUTPUT_DIR}/${CMAKE_BUILD_TYPE}")
|
|
|
|
else()
|
|
|
|
set(TEST_SUITE_COMMAND "run_test_suite")
|
|
|
|
set(TEST_SUITE_WORKING_DIRECTORY "${TESTSUITE_OUTPUT_DIR}")
|
|
|
|
endif(WIN32)
|
2016-10-17 17:11:44 +00:00
|
|
|
else()
|
2018-03-16 10:28:18 +00:00
|
|
|
set(TEST_SUITE_COMMENT "Building the FlightGear test suite.")
|
|
|
|
endif(ENABLE_AUTOTESTING)
|
|
|
|
|
|
|
|
add_custom_target(test_suite
|
|
|
|
${TEST_SUITE_COMMAND}
|
|
|
|
DEPENDS run_test_suite
|
|
|
|
WORKING_DIRECTORY ${TEST_SUITE_WORKING_DIRECTORY}
|
|
|
|
COMMENT ${TEST_SUITE_COMMENT}
|
|
|
|
)
|
2016-01-28 15:56:10 +00:00
|
|
|
|
2018-03-25 12:18:24 +00:00
|
|
|
# Set up the target links and includes.
|
|
|
|
setup_fgfs_libraries(run_test_suite)
|
2016-01-28 15:56:10 +00:00
|
|
|
|
2018-03-25 12:18:24 +00:00
|
|
|
# Additional libraries just for the test suite.
|
|
|
|
target_link_libraries(run_test_suite ${CPPUNIT_LIBRARIES})
|