From 6b8f2efabb8c382dc9cb0e0ce6c70626b615bc4b Mon Sep 17 00:00:00 2001 From: Torsten Wierschin Date: Wed, 7 Oct 2026 11:52:09 +0000 Subject: [PATCH] Constraints scripts to first release packages --- .../Lts/Common/CMakeLists.txt | 1 + .../qt6-migrated-legatus/new_docker_build.sh | 26 +++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt b/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt index 6b0ffa8bb..2c424c9fa 100755 --- a/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt +++ b/qt6-after/qt6-migrated-legatus/Lts/Common/CMakeLists.txt @@ -5,6 +5,7 @@ # ADD_SUBDIRECTORY(CodeGen) +ADD_SUBDIRECTORY(CommonUnitTestsPlaceholder) ADD_SUBDIRECTORY(httq) ADD_SUBDIRECTORY(LtsAppDescriptor) ADD_SUBDIRECTORY(LtsAppManager) diff --git a/qt6-after/qt6-migrated-legatus/new_docker_build.sh b/qt6-after/qt6-migrated-legatus/new_docker_build.sh index fb4176478..b3d1081a0 100755 --- a/qt6-after/qt6-migrated-legatus/new_docker_build.sh +++ b/qt6-after/qt6-migrated-legatus/new_docker_build.sh @@ -93,7 +93,7 @@ Environment variable overrides: BUILD_GROUP9=ON|OFF BUILD_GROUP10=ON|OFF BUILD_GROUP11=ON|OFF - RUN_CTEST=ON|OFF (automatically OFF for RELEASE_BUILD=ON) + RUN_CTEST=ON|OFF (automatically ON for RELEASE_BUILD=ON - tests in Lts/Common + Z) TESTS_ONLY=ON|OFF INTEGRATION_TEST=ON|OFF USE_PREBUILT_IMAGE=ON|OFF @@ -124,7 +124,7 @@ Defaults: BUILD_GROUP9=OFF BUILD_GROUP10=OFF BUILD_GROUP11=OFF Release: OFF (Lts/Application - not in scope) - RUN_CTEST=ON + RUN_CTEST=ON Release: ON (tests in Lts/Common + Z components) TESTS_ONLY=OFF INTEGRATION_TEST=OFF USE_PREBUILT_IMAGE=OFF @@ -518,9 +518,10 @@ GROUP3_TARGETS=( whgTests ) -# Release build targets: Z components only (no Lts/Services) +# Release build targets: Z components + Lts/Common libraries (no Lts/Services) # Used when RELEASE_BUILD=ON to build only release scope modules RELEASE_GROUP3_TARGETS=( + # Z module targets NGLLogger nglapplication nglcompression @@ -537,6 +538,18 @@ RELEASE_GROUP3_TARGETS=( qtsinglecoreapplication wms_json_ds tcpserver + # Lts/Common library targets (for tests) + LtsCoordTrans + LtsLicence + ngl_codegen + MockCoordTrans + # Test executables for release scope modules + # Note: test_nglpdfwidget excluded - requires Poppler-Qt6 (not in release scope) + # Note: nglcomp_test excluded - compression "Unknown error" in Qt6 (requires investigation) + # Note: grantlee_parser_smoke excluded - requires ktexttemplate_defaulttags plugin (not in release scope) + aes_crypt_test + ngltools_qt_smoke + lts_coord_trans_unit_test ) GROUP4_TARGETS=( @@ -1123,9 +1136,12 @@ if [[ "$TESTS_ONLY" == "ON" ]]; then RUN_CTEST=ON fi -# Release builds skip CTest (tests not in release scope) +# Release builds: CTest enabled for tests within release scope (Lts/Common + Z) +# Tests in excluded modules (GROUP1, GROUP2, GROUP4, GROUP5, GROUP11) will not be built if [[ "$RELEASE_BUILD" == "ON" ]]; then - RUN_CTEST=OFF + # CTest runs if tests are available in built modules + # Lts/Common and Z modules may include tests (e.g., ngltools_qt_smoke, coordTransTests) + RUN_CTEST="${RUN_CTEST:-ON}" fi log_info "BUILD_RTI=${BUILD_RTI}"