fly/flightgear
1
0
Fork 0
Code Activity

Fix up linkage of Nasal tests inside CppUnit

Browse source 
Ensure correct test backend is used inside fgfs_test_suite
This commit is contained in:
James Turner 2022-01-05 15:41:33 +00:00
parent 2b88a3c23f
commit a7ae3bf6cd
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Main/CMakeLists.txt
View file

@ -59,6 +59,9 @@ flightgear_component(Main "${SOURCES}" "${HEADERS}" sentryIntegration.cxx)
# the main() function # the main() function
set(MAIN_SOURCE set(MAIN_SOURCE
bootstrap.cxx bootstrap.cxx
# we only want this file when building FGFS, so it can't be
# part of fgfsObjects
${CMAKE_SOURCE_DIR}/src/Scripting/NasalUnitTesting.cxx
) )
# Set up the embedded resources. # Set up the embedded resources.

4
src/Scripting/CMakeLists.txt
View file

@ -13,8 +13,10 @@ set(SOURCES
NasalString.cxx NasalString.cxx
NasalModelData.cxx NasalModelData.cxx
NasalSGPath.cxx NasalSGPath.cxx
NasalUnitTesting.cxx
NasalFlightPlan.cxx NasalFlightPlan.cxx
# we don't add this here becuase we need to exclude it the testSuite
# so it can't go nto fgfsObjects library
# NasalUnitTesting.cxx
) )
set(HEADERS set(HEADERS

5
test_suite/FGTestApi/NasalUnitTesting_TestSuite.cxx
View file

@ -124,3 +124,8 @@ naRef initNasalUnitTestCppUnit(naRef nasalGlobals, naContext c)
return naNil(); return naNil();
} }
void shutdownNasalUnitTestInSim()
{
// stub
}