Adapts shared tests and common code to generated rtiddsgen API
Updates test suites and Lts/Common consumers to plain member access.
This commit is contained in:
41 files changed
+1076
-235
No files matched your search
@@ -116,6 +116,54 @@ if(BUILD_TESTING)
|
||||
add_dependencies(migration_tests svcFltCommon)
|
||||
endif()
|
||||
|
||||
# The *_dtc/*_enums tests include the rtiddsgen/codegen outputs of
|
||||
# the migrated services from ${CMAKE_BINARY_DIR}/Lts/Services. The
|
||||
# OFF-era stub copies these tests used to resolve (include/ and
|
||||
# Lts/Services source stubs) were removed, so the codegen of each
|
||||
# service must run before migration_tests compiles - the same
|
||||
# ordering the svcFlmCommon/svcFltCommon blocks above provide.
|
||||
# Nothing else in the docker_build.sh make list builds these
|
||||
# service targets, so without these deps the generated headers are
|
||||
# missing on a fresh build.
|
||||
foreach(_svc_common IN ITEMS
|
||||
svcAesCommon svcAlmCommon svcAsmCommon svcAvmCommon svcCodCommon
|
||||
svcEemCommon svcEsmCommon svcEscCommon svcEvlCommon svcExmCommon
|
||||
svcGimCommon svcIsmCommon svcMdmCommon svcMsgCommon svcMrkCommon
|
||||
svcNomCommon svcOpmCommon svcOssCommon svcPdmCommon svcPpmCommon
|
||||
svcPreCommon svcRepCommon svcSomCommon svcSrmCommon svcSrpCommon
|
||||
svcTgtCommon svcWhgCommon)
|
||||
if(TARGET ${_svc_common})
|
||||
add_dependencies(migration_tests ${_svc_common})
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
# test_core_enums includes Lts/DDS/Core/core_enums.hpp, an rtiddsgen
|
||||
# output built by ddscore. ddscore is in the make target list, but a
|
||||
# parallel make gives no ordering between it and migration_tests.
|
||||
if(TARGET ddscore)
|
||||
add_dependencies(migration_tests ddscore)
|
||||
endif()
|
||||
|
||||
# test_tab_dtc includes the TrainingAreaBase rtiddsgen/codegen
|
||||
# outputs (tab.hpp, tab_dtc.h) from build4/Lts/Proxies - same
|
||||
# ordering requirement as the service blocks above.
|
||||
if(TARGET svcTabCommon)
|
||||
add_dependencies(migration_tests svcTabCommon)
|
||||
endif()
|
||||
|
||||
# test_taboc_dtc includes the TrainingAreaBaseOC outputs
|
||||
# (taboc.hpp, taboc_dtc.h) from build4/Lts/Proxies likewise.
|
||||
if(TARGET svcTabocCommon)
|
||||
add_dependencies(migration_tests svcTabocCommon)
|
||||
endif()
|
||||
|
||||
# test_bld_dtc / test_bld_enums include the Buildings outputs
|
||||
# (bld.hpp, bld_dtc.h, bld_enums.hpp) from build4/Lts/Proxies
|
||||
# likewise (the CONFIGURE_FILE stub copy was removed).
|
||||
if(TARGET svcBldCommon)
|
||||
add_dependencies(migration_tests svcBldCommon)
|
||||
endif()
|
||||
|
||||
# Enable Qt Meta-Object Compiler for tests with Q_OBJECT
|
||||
set_target_properties(migration_tests PROPERTIES AUTOMOC ON)
|
||||
|
||||
@@ -139,6 +187,15 @@ if(BUILD_TESTING)
|
||||
${CMAKE_SOURCE_DIR}/Lts/Common/LtsTimelineClassic
|
||||
${CMAKE_BINARY_DIR}/Lts/Services
|
||||
${CMAKE_SOURCE_DIR}/Lts/Services
|
||||
${CMAKE_SOURCE_DIR}/Lts/Proxies
|
||||
${CMAKE_BINARY_DIR}/Lts/Proxies
|
||||
# Source headers under Lts/DDS/DDSConnector and
|
||||
# Lts/Common/LtsCoordTrans include their build-tree export
|
||||
# headers by bare quoted name (ddsconnector_export.h,
|
||||
# ltscoordtrans_export.h); the OFF-stub copies under include/
|
||||
# that used to satisfy those includes were removed.
|
||||
${CMAKE_BINARY_DIR}/Lts/DDS/DDSConnector
|
||||
${CMAKE_BINARY_DIR}/Lts/Common/LtsCoordTrans
|
||||
${CMAKE_SOURCE_DIR}/Z/src/NGLLogger
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user