Complete Qt6/rtiddsgen migration of residual Lts service sources
This commit is contained in:
86 files changed
+1235
-1128
No files matched your search
@@ -65,6 +65,11 @@ if(BUILD_TESTING)
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor_editor\\.cpp")
|
||||
# Exclude Qt Test-based tests (conflict with gtest main())
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_lts_app_descriptor\\.cpp")
|
||||
# Exclude test_skl_dtc: "Skeleton" is a placeholder service (no source
|
||||
# dir, no svcSklCommon target, no codegen output). Its stub header was
|
||||
# converted to a build-dir wrapper (commit 5501d1e5) that includes a
|
||||
# non-existent generated file, so the compilation test cannot resolve.
|
||||
list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_skl_dtc\\.cpp")
|
||||
|
||||
# Exclude Grantlee-related tests when BUILD_GRANTLEE is OFF
|
||||
if(NOT BUILD_GRANTLEE)
|
||||
@@ -138,6 +143,20 @@ if(BUILD_TESTING)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
# test_ces_dtc / test_scm_dtc include the CentralEffectSimulation and
|
||||
# ServiceManagement rtiddsgen/codegen outputs (ces_dtc.h, scm_dtc.h)
|
||||
# from build4/Lts/Services; test_cmo_dtc / test_gna_dtc include the
|
||||
# ComponentMonitor and GuezNasat outputs (cmo_dtc.h, gna_dtc.h) from
|
||||
# build4/Lts/Proxies. Same ordering requirement as the blocks above:
|
||||
# without these deps a parallel make can start migration_tests before
|
||||
# those headers exist.
|
||||
foreach(_extra_common IN ITEMS
|
||||
svcCesCommon svcCmoCommon svcGnaCommon svcScmCommon)
|
||||
if(TARGET ${_extra_common})
|
||||
add_dependencies(migration_tests ${_extra_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.
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
/**
|
||||
* @file test_scm_dtc.cpp
|
||||
* @brief Compilation test for the migrated ScenarioManagement/scm_dtc.h
|
||||
* @brief Compilation test for the migrated ServiceManagement/scm_dtc.h
|
||||
*
|
||||
* This test verifies that the migrated header compiles correctly with Qt6/C++23.
|
||||
* Resolves to the codegen-generated header (BUILD_GRANTLEE=ON / BUILD_RTI=ON).
|
||||
*/
|
||||
|
||||
#include "ScenarioManagement/scm_dtc.h"
|
||||
#include "ServiceManagement/scm_dtc.h"
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user