From 2b8f3f02c7207ea45c533740d0c5242d42c83709 Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Thu, 24 Sep 2026 16:43:47 +0000 Subject: [PATCH] Add Group 9 (R,S,T,V,W) LTS Tools migration support - Added --group9/--no-group9 command line options to new_docker_build.sh - Added BUILD_GROUP9 variable and GROUP9_TARGETS array with 12 buildable tools: RestClientUi, ScreenIdShow, SerialToTcpConverter, Splash, SqlBrowser, TextEditorTest, Times, TopicDiscover, TrajectoryWidget, VapixConfig, VideoImport, WlsRandomPositions - Added Docker environment exports for BUILD_GROUP9 and GROUP9_TARGETS - Added run_build_group call for Group 9 in build sequence - Created 12 CTest test files for Group 9 tools - Added Group 9 exclusion filters to tests/CMakeLists.txt - No Qt5 migration issues found in Group 9 CMakeLists.txt files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../qt6-migrated-legatus/new_docker_build.sh | 31 +++++++++++++++- .../qt6-migrated-legatus/tests/CMakeLists.txt | 37 +++++++++++++++++++ .../tests/test_rest_client_ui.cmake | 6 +++ .../tests/test_screen_id_show.cmake | 6 +++ .../tests/test_serial_to_tcp_converter.cmake | 6 +++ .../tests/test_splash.cmake | 6 +++ .../tests/test_sql_browser.cmake | 6 +++ .../tests/test_text_editor_test.cmake | 6 +++ .../tests/test_times.cmake | 6 +++ .../tests/test_topic_discover.cmake | 6 +++ .../tests/test_trajectory_widget.cmake | 6 +++ .../tests/test_vapix_config.cmake | 6 +++ .../tests/test_video_import.cmake | 6 +++ .../tests/test_wls_random_positions.cmake | 6 +++ 14 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_rest_client_ui.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_screen_id_show.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_serial_to_tcp_converter.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_splash.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_sql_browser.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_text_editor_test.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_times.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_topic_discover.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_trajectory_widget.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_vapix_config.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_video_import.cmake create mode 100644 qt6-after/qt6-migrated-legatus/tests/test_wls_random_positions.cmake diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index e1e0f0be8..f75b5db8a 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -97,6 +97,7 @@ Defaults: BUILD_GROUP6=OFF BUILD_GROUP7=OFF BUILD_GROUP8=OFF + BUILD_GROUP9=OFF RUN_CTEST=ON TESTS_ONLY=OFF INTEGRATION_TEST=OFF @@ -497,6 +498,12 @@ while [[ $# -gt 0 ]]; do --no-group8) BUILD_GROUP8=OFF ;; + --group9) + BUILD_GROUP9=ON + ;; + --no-group9) + BUILD_GROUP9=OFF + ;; --build-viewer-only) BUILD_VIEWER_ONLY=ON BUILD_GROUP5=ON @@ -582,7 +589,7 @@ BUILD_PREBUILT_IMAGE="$(normalize_on_off "$BUILD_PREBUILT_IMAGE" "BUILD_PREBUILT DELETE_PREBUILT_IMAGE="$(normalize_on_off "$DELETE_PREBUILT_IMAGE" "DELETE_PREBUILT_IMAGE")" # Export variables for Docker container -export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE +export BUILD_ALL BUILD_RTI BUILD_GRANTLEE BUILD_ARCGIS BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 BUILD_GROUP5 BUILD_GROUP6 BUILD_GROUP7 BUILD_GROUP8 BUILD_GROUP9 BUILD_VIEWER_ONLY RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE # Group 5: Viewer module targets (conditional on BUILD_ARCGIS) if [[ "${BUILD_ARCGIS}" == "ON" ]]; then @@ -640,6 +647,22 @@ GROUP8_TARGETS=( QLedMatrix ) +# Group 9: LTS Tools R,S,T,V,W directories (Qt6 migration targets) +GROUP9_TARGETS=( + RestClientUi + ScreenIdShow + SerialToTcpConverter + Splash + SqlBrowser + TextEditorTest + Times + TopicDiscover + TrajectoryWidget + VapixConfig + VideoImport + WlsRandomPositions +) + require_non_empty "${DOCKER_IMAGE}" "DOCKER_IMAGE" if [[ "${DELETE_PREBUILT_IMAGE}" == "ON" ]]; then @@ -670,6 +693,7 @@ log_group "Build Group 2 (migration_tests)" "$BUILD_GROUP2" log_group "Build Group 3 (application targets)" "$BUILD_GROUP3" log_group "Build Group 7 (LTS Tools A,B,C,E,I)" "$BUILD_GROUP7" log_group "Build Group 8 (LTS Tools J,M,N,P,Q)" "$BUILD_GROUP8" +log_group "Build Group 9 (LTS Tools R,S,T,V,W)" "$BUILD_GROUP9" log_info "BUILD_VIEWER_ONLY=${BUILD_VIEWER_ONLY}" log_info "RUN_CTEST=${RUN_CTEST}" log_info "TESTS_ONLY=${TESTS_ONLY}" @@ -703,6 +727,8 @@ GROUP4_TARGETS_STRING="$(join_by ' ' "${GROUP4_TARGETS[@]}")" GROUP5_TARGETS_STRING="$(join_by ' ' "${GROUP5_TARGETS[@]}")" GROUP6_TARGETS_STRING="$(join_by ' ' "${GROUP6_TARGETS[@]}")" GROUP7_TARGETS_STRING="$(join_by ' ' "${GROUP7_TARGETS[@]}")" +GROUP8_TARGETS_STRING="$(join_by ' ' "${GROUP8_TARGETS[@]}")" +GROUP9_TARGETS_STRING="$(join_by ' ' "${GROUP9_TARGETS[@]}")" HOST_TEMP_DIR="$(mktemp -d)" CONTAINER_SCRIPT_HOST="${HOST_TEMP_DIR}/run-build-inside-container.sh" @@ -837,6 +863,7 @@ if [[ "${TESTS_ONLY}" != "ON" ]]; then run_build_group "Group 6 (LTS Tools)" "${BUILD_GROUP6}" "group6_build.log" "${GROUP6_ARRAY[@]}" run_build_group "Group 7 (LTS Tools A,B,C,E,I)" "${BUILD_GROUP7}" "group7_build.log" "${GROUP7_ARRAY[@]}" run_build_group "Group 8 (LTS Tools J,M,N,P,Q)" "${BUILD_GROUP8}" "group8_build.log" "${GROUP8_ARRAY[@]}" + run_build_group "Group 9 (LTS Tools R,S,T,V,W)" "${BUILD_GROUP9}" "group9_build.log" "${GROUP9_ARRAY[@]}" else log_info "TESTS_ONLY enabled - skipping all build groups" fi @@ -871,6 +898,7 @@ docker run --rm \ -e BUILD_GROUP6 \ -e BUILD_GROUP7 \ -e BUILD_GROUP8 \ + -e BUILD_GROUP9 \ -e BUILD_VIEWER_ONLY \ -e RUN_CTEST \ -e TESTS_ONLY \ @@ -889,6 +917,7 @@ docker run --rm \ -e GROUP6_TARGETS="${GROUP6_TARGETS_STRING}" \ -e GROUP7_TARGETS="${GROUP7_TARGETS_STRING}" \ -e GROUP8_TARGETS="${GROUP8_TARGETS_STRING}" \ + -e GROUP9_TARGETS="${GROUP9_TARGETS_STRING}" \ -v "${WORKSPACE_ROOT_HOST}:/workspace" \ -v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \ -v "${MIGRATE_PIPELINE_ROOT}/external:/workspace/external:ro" \ diff --git a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt index 5e99f04a9..278260349 100644 --- a/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/tests/CMakeLists.txt @@ -166,6 +166,43 @@ if(BUILD_TESTING) if(NOT TARGET QLedMatrix) list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_QLedMatrix\\.cpp") endif() + # Group 9 (R,S,T,V,W) exclusions + if(NOT TARGET RestClientUi) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_RestClientUi\\.cpp") + endif() + if(NOT TARGET ScreenIdShow) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_ScreenIdShow\\.cpp") + endif() + if(NOT TARGET SerialToTcpConverter) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_SerialToTcpConverter\\.cpp") + endif() + if(NOT TARGET Splash) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_Splash\\.cpp") + endif() + if(NOT TARGET SqlBrowser) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_SqlBrowser\\.cpp") + endif() + if(NOT TARGET TextEditorTest) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_TextEditorTest\\.cpp") + endif() + if(NOT TARGET Times) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_Times\\.cpp") + endif() + if(NOT TARGET TopicDiscover) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_TopicDiscover\\.cpp") + endif() + if(NOT TARGET TrajectoryWidget) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_TrajectoryWidget\\.cpp") + endif() + if(NOT TARGET VapixConfig) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_VapixConfig\\.cpp") + endif() + if(NOT TARGET VideoImport) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_VideoImport\\.cpp") + endif() + if(NOT TARGET WlsRandomPositions) + list(FILTER EXISTING_SOURCES EXCLUDE REGEX "test_WlsRandomPositions\\.cpp") + endif() if(NOT EXISTING_SOURCES) message(WARNING "No migration test sources found after filtering - skipping migration_tests target") diff --git a/qt6-after/qt6-migrated-legatus/tests/test_rest_client_ui.cmake b/qt6-after/qt6-migrated-legatus/tests/test_rest_client_ui.cmake new file mode 100644 index 000000000..809ce28ce --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_rest_client_ui.cmake @@ -0,0 +1,6 @@ +# CTest test file for RestClientUi +add_test(NAME test_rest_client_ui COMMAND RestClientUi --help) +set_tests_properties(test_rest_client_ui PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_screen_id_show.cmake b/qt6-after/qt6-migrated-legatus/tests/test_screen_id_show.cmake new file mode 100644 index 000000000..92ac35f31 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_screen_id_show.cmake @@ -0,0 +1,6 @@ +# CTest test file for ScreenIdShow +add_test(NAME test_screen_id_show COMMAND ScreenIdShow --help) +set_tests_properties(test_screen_id_show PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_serial_to_tcp_converter.cmake b/qt6-after/qt6-migrated-legatus/tests/test_serial_to_tcp_converter.cmake new file mode 100644 index 000000000..ccc51c275 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_serial_to_tcp_converter.cmake @@ -0,0 +1,6 @@ +# CTest test file for SerialToTcpConverter +add_test(NAME test_serial_to_tcp_converter COMMAND SerialToTcpConverter --help) +set_tests_properties(test_serial_to_tcp_converter PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_splash.cmake b/qt6-after/qt6-migrated-legatus/tests/test_splash.cmake new file mode 100644 index 000000000..d8ac2a902 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_splash.cmake @@ -0,0 +1,6 @@ +# CTest test file for Splash +add_test(NAME test_splash COMMAND Splash --help) +set_tests_properties(test_splash PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_sql_browser.cmake b/qt6-after/qt6-migrated-legatus/tests/test_sql_browser.cmake new file mode 100644 index 000000000..540e1bdbf --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_sql_browser.cmake @@ -0,0 +1,6 @@ +# CTest test file for SqlBrowser +add_test(NAME test_sql_browser COMMAND SqlBrowser --help) +set_tests_properties(test_sql_browser PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_text_editor_test.cmake b/qt6-after/qt6-migrated-legatus/tests/test_text_editor_test.cmake new file mode 100644 index 000000000..9d5eb8402 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_text_editor_test.cmake @@ -0,0 +1,6 @@ +# CTest test file for TextEditorTest +add_test(NAME test_text_editor_test COMMAND TextEditorTest --help) +set_tests_properties(test_text_editor_test PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_times.cmake b/qt6-after/qt6-migrated-legatus/tests/test_times.cmake new file mode 100644 index 000000000..b4d7810a4 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_times.cmake @@ -0,0 +1,6 @@ +# CTest test file for Times +add_test(NAME test_times COMMAND Times --help) +set_tests_properties(test_times PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_topic_discover.cmake b/qt6-after/qt6-migrated-legatus/tests/test_topic_discover.cmake new file mode 100644 index 000000000..723a84b04 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_topic_discover.cmake @@ -0,0 +1,6 @@ +# CTest test file for TopicDiscover +add_test(NAME test_topic_discover COMMAND TopicDiscover --help) +set_tests_properties(test_topic_discover PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_trajectory_widget.cmake b/qt6-after/qt6-migrated-legatus/tests/test_trajectory_widget.cmake new file mode 100644 index 000000000..c1058943e --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_trajectory_widget.cmake @@ -0,0 +1,6 @@ +# CTest test file for TrajectoryWidget +add_test(NAME test_trajectory_widget COMMAND TrajectoryWidget --help) +set_tests_properties(test_trajectory_widget PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_vapix_config.cmake b/qt6-after/qt6-migrated-legatus/tests/test_vapix_config.cmake new file mode 100644 index 000000000..b30660fe5 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_vapix_config.cmake @@ -0,0 +1,6 @@ +# CTest test file for VapixConfig +add_test(NAME test_vapix_config COMMAND VapixConfig --help) +set_tests_properties(test_vapix_config PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_video_import.cmake b/qt6-after/qt6-migrated-legatus/tests/test_video_import.cmake new file mode 100644 index 000000000..89a37ddbb --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_video_import.cmake @@ -0,0 +1,6 @@ +# CTest test file for VideoImport +add_test(NAME test_video_import COMMAND VideoImport --help) +set_tests_properties(test_video_import PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file diff --git a/qt6-after/qt6-migrated-legatus/tests/test_wls_random_positions.cmake b/qt6-after/qt6-migrated-legatus/tests/test_wls_random_positions.cmake new file mode 100644 index 000000000..fa6e57618 --- /dev/null +++ b/qt6-after/qt6-migrated-legatus/tests/test_wls_random_positions.cmake @@ -0,0 +1,6 @@ +# CTest test file for WlsRandomPositions +add_test(NAME test_wls_random_positions COMMAND WlsRandomPositions --help) +set_tests_properties(test_wls_random_positions PROPERTIES + TIMEOUT 30 + PASS_REGULAR_EXPRESSION ".*" +) \ No newline at end of file