Adds succesfull lts/proxies migration & testsuite
This commit is contained in:
59 files changed
+754
-273
No files matched your search
@@ -30,11 +30,12 @@ Build groups:
|
||||
--group1 / --no-group1 Enable/disable DDS core libraries build
|
||||
--group2 / --no-group2 Enable/disable migration_tests build
|
||||
--group3 / --no-group3 Enable/disable remaining application targets build
|
||||
--group4 / --no-group4 Enable/disable Lts/Proxies module targets and tests only
|
||||
|
||||
Test execution:
|
||||
--no-ctest Skip ctest execution
|
||||
--tests-only Run only ctest, skip all make build groups
|
||||
--integration-test Run only Z-module integration tests (test_z_*)
|
||||
--integration-test Run only integration tests (test_z_*, bld_*, tab_*, wls_*)
|
||||
|
||||
Prebuilt Docker image usage:
|
||||
--use-prebuilt-image Use a Docker image with dependencies already installed
|
||||
@@ -238,6 +239,63 @@ GROUP3_TARGETS=(
|
||||
qtsinglecoreapplication
|
||||
wms_json_ds
|
||||
tcpserver
|
||||
# ProjectDataManagement
|
||||
svcPdmCommon
|
||||
svcPdmClient
|
||||
svcPdmServer
|
||||
svcProjectDataManagement
|
||||
pdmTests
|
||||
)
|
||||
|
||||
GROUP4_TARGETS=(
|
||||
# Proxies module - Buildings
|
||||
BuildingControlCommon
|
||||
BuildingControlBsm
|
||||
BuildingControlTestBsm
|
||||
BuildingControlVwm
|
||||
BuildingControlTestVwm
|
||||
BuildingControlTestVwmXml
|
||||
# BuildingControlJson - requires Qt6WebSockets (not available)
|
||||
# ControlEffects - may depend on BuildingControlJson
|
||||
# ControlEffectsTest
|
||||
# BuildingControlUnit - depends on BuildingControlJson
|
||||
svcBldServer
|
||||
svcBuildings
|
||||
# Proxies module - TrainingAreaBase
|
||||
tabTelegrams
|
||||
svcTabCommon
|
||||
svcTabClient
|
||||
svcTabServer
|
||||
svcTrainingAreaBase
|
||||
tabPluginInterface
|
||||
TmsIfAdapterInterface
|
||||
TmsIfAdapter
|
||||
tabPluginUAS
|
||||
TabUASTest3
|
||||
TabUASTest4_2
|
||||
TabUASTest6
|
||||
# Proxies module - TrainingAreaBaseOC
|
||||
svcTabocCommon
|
||||
svcTabocClient
|
||||
svcTabocServer
|
||||
svcTrainingAreaBaseOC
|
||||
serialtest
|
||||
# Proxies module - WirelessLocationSystem
|
||||
svcWirelessLocationSystem
|
||||
wlsJsonClientTest
|
||||
# Proxies module - Other
|
||||
svcCmoCommon
|
||||
svcCmoClient
|
||||
svcCmoServer
|
||||
svcComponentMonitor
|
||||
svcCnrHelper
|
||||
svcCombatNetRadio
|
||||
svcDifferentialGPS
|
||||
svcGnaCommon
|
||||
svcGnaClient
|
||||
svcGnaServer
|
||||
svcWarehouseManagement
|
||||
Tetra_dgps_simulator
|
||||
)
|
||||
|
||||
APT_PACKAGES_STRING="$(join_by ' ' "${APT_PACKAGES[@]}")"
|
||||
@@ -278,10 +336,12 @@ set -a
|
||||
source ".envrc"
|
||||
set +a
|
||||
|
||||
BUILD_ALL="${BUILD_ALL:-ON}"
|
||||
BUILD_RTI="${BUILD_RTI:-ON}"
|
||||
BUILD_GROUP1="${BUILD_GROUP1:-ON}"
|
||||
BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
BUILD_GROUP4="${BUILD_GROUP4:-OFF}"
|
||||
RUN_CTEST="${RUN_CTEST:-ON}"
|
||||
TESTS_ONLY="${TESTS_ONLY:-OFF}"
|
||||
USE_PREBUILT_IMAGE="${USE_PREBUILT_IMAGE:-OFF}"
|
||||
@@ -318,6 +378,12 @@ while [[ $# -gt 0 ]]; do
|
||||
--no-group3)
|
||||
BUILD_GROUP3=OFF
|
||||
;;
|
||||
--group4)
|
||||
BUILD_GROUP4=ON
|
||||
;;
|
||||
--no-group4)
|
||||
BUILD_GROUP4=OFF
|
||||
;;
|
||||
--no-ctest)
|
||||
RUN_CTEST=OFF
|
||||
;;
|
||||
@@ -356,10 +422,24 @@ while [[ $# -gt 0 ]]; do
|
||||
shift
|
||||
done
|
||||
|
||||
# Set defaults for variables not set by command-line arguments
|
||||
BUILD_RTI="${BUILD_RTI:-ON}"
|
||||
BUILD_GROUP1="${BUILD_GROUP1:-ON}"
|
||||
BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
RUN_CTEST="${RUN_CTEST:-ON}"
|
||||
TESTS_ONLY="${TESTS_ONLY:-OFF}"
|
||||
INTEGRATION_TEST="${INTEGRATION_TEST:-OFF}"
|
||||
USE_PREBUILT_IMAGE="${USE_PREBUILT_IMAGE:-OFF}"
|
||||
BUILD_PREBUILT_IMAGE="${BUILD_PREBUILT_IMAGE:-OFF}"
|
||||
DELETE_PREBUILT_IMAGE="${DELETE_PREBUILT_IMAGE:-OFF}"
|
||||
|
||||
BUILD_ALL="$(normalize_on_off "$BUILD_ALL" "BUILD_ALL")"
|
||||
BUILD_RTI="$(normalize_on_off "$BUILD_RTI" "BUILD_RTI")"
|
||||
BUILD_GROUP1="$(normalize_on_off "$BUILD_GROUP1" "BUILD_GROUP1")"
|
||||
BUILD_GROUP2="$(normalize_on_off "$BUILD_GROUP2" "BUILD_GROUP2")"
|
||||
BUILD_GROUP3="$(normalize_on_off "$BUILD_GROUP3" "BUILD_GROUP3")"
|
||||
BUILD_GROUP4="$(normalize_on_off "$BUILD_GROUP4" "BUILD_GROUP4")"
|
||||
RUN_CTEST="$(normalize_on_off "$RUN_CTEST" "RUN_CTEST")"
|
||||
TESTS_ONLY="$(normalize_on_off "$TESTS_ONLY" "TESTS_ONLY")"
|
||||
INTEGRATION_TEST="$(normalize_on_off "$INTEGRATION_TEST" "INTEGRATION_TEST")"
|
||||
@@ -367,6 +447,9 @@ USE_PREBUILT_IMAGE="$(normalize_on_off "$USE_PREBUILT_IMAGE" "USE_PREBUILT_IMAGE
|
||||
BUILD_PREBUILT_IMAGE="$(normalize_on_off "$BUILD_PREBUILT_IMAGE" "BUILD_PREBUILT_IMAGE")"
|
||||
DELETE_PREBUILT_IMAGE="$(normalize_on_off "$DELETE_PREBUILT_IMAGE" "DELETE_PREBUILT_IMAGE")"
|
||||
|
||||
# Export variables for Docker container
|
||||
export BUILD_ALL BUILD_RTI BUILD_GROUP1 BUILD_GROUP2 BUILD_GROUP3 BUILD_GROUP4 RUN_CTEST TESTS_ONLY INTEGRATION_TEST USE_PREBUILT_IMAGE BUILD_PREBUILT_IMAGE DELETE_PREBUILT_IMAGE DOCKER_IMAGE
|
||||
|
||||
require_non_empty "${DOCKER_IMAGE}" "DOCKER_IMAGE"
|
||||
|
||||
if [[ "${DELETE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
@@ -423,6 +506,7 @@ fi
|
||||
GROUP1_TARGETS_STRING="$(join_by ' ' "${GROUP1_TARGETS[@]}")"
|
||||
GROUP2_TARGETS_STRING="$(join_by ' ' "${GROUP2_TARGETS[@]}")"
|
||||
GROUP3_TARGETS_STRING="$(join_by ' ' "${GROUP3_TARGETS[@]}")"
|
||||
GROUP4_TARGETS_STRING="$(join_by ' ' "${GROUP4_TARGETS[@]}")"
|
||||
|
||||
HOST_TEMP_DIR="$(mktemp -d)"
|
||||
CONTAINER_SCRIPT_HOST="${HOST_TEMP_DIR}/run-build-inside-container.sh"
|
||||
@@ -437,10 +521,12 @@ set -euo pipefail
|
||||
|
||||
# Default variable assignments to prevent unbound variable errors
|
||||
USE_PREBUILT_IMAGE="${USE_PREBUILT_IMAGE:-OFF}"
|
||||
BUILD_ALL="${BUILD_ALL:-ON}"
|
||||
BUILD_RTI="${BUILD_RTI:-ON}"
|
||||
BUILD_GROUP1="${BUILD_GROUP1:-ON}"
|
||||
BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
BUILD_GROUP4="${BUILD_GROUP4:-OFF}"
|
||||
RUN_CTEST="${RUN_CTEST:-ON}"
|
||||
TESTS_ONLY="${TESTS_ONLY:-OFF}"
|
||||
INTEGRATION_TEST="${INTEGRATION_TEST:-OFF}"
|
||||
@@ -492,19 +578,21 @@ cmake .. \
|
||||
read -r -a GROUP1_ARRAY <<< "${GROUP1_TARGETS}"
|
||||
read -r -a GROUP2_ARRAY <<< "${GROUP2_TARGETS}"
|
||||
read -r -a GROUP3_ARRAY <<< "${GROUP3_TARGETS}"
|
||||
read -r -a GROUP4_ARRAY <<< "${GROUP4_TARGETS}"
|
||||
|
||||
if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
run_build_group "Group 1" "${BUILD_GROUP1}" "group1_build.log" "${GROUP1_ARRAY[@]}"
|
||||
run_build_group "Group 2" "${BUILD_GROUP2}" "group2_build.log" "${GROUP2_ARRAY[@]}"
|
||||
run_build_group "Group 3" "${BUILD_GROUP3}" "group3_build.log" "${GROUP3_ARRAY[@]}"
|
||||
run_build_group "Group 4" "${BUILD_GROUP4}" "group4_build.log" "${GROUP4_ARRAY[@]}"
|
||||
else
|
||||
log_info "TESTS_ONLY enabled - skipping all build groups"
|
||||
fi
|
||||
|
||||
if [[ "${RUN_CTEST}" == "ON" ]]; then
|
||||
if [[ "${INTEGRATION_TEST}" == "ON" ]]; then
|
||||
log_info "Running Z-module integration tests only"
|
||||
ctest --test-dir . --output-on-failure -R "test_z_"
|
||||
log_info "Running integration tests (Z-module + Proxies)"
|
||||
ctest --test-dir . --output-on-failure -R "(test_z_|bld_|tab_|wls_)"
|
||||
else
|
||||
log_info "Running CTest"
|
||||
ctest --test-dir . --output-on-failure
|
||||
@@ -524,6 +612,7 @@ docker run --rm \
|
||||
-e BUILD_GROUP1 \
|
||||
-e BUILD_GROUP2 \
|
||||
-e BUILD_GROUP3 \
|
||||
-e BUILD_GROUP4 \
|
||||
-e RUN_CTEST \
|
||||
-e TESTS_ONLY \
|
||||
-e INTEGRATION_TEST \
|
||||
@@ -532,6 +621,7 @@ docker run --rm \
|
||||
-e GROUP1_TARGETS="${GROUP1_TARGETS_STRING}" \
|
||||
-e GROUP2_TARGETS="${GROUP2_TARGETS_STRING}" \
|
||||
-e GROUP3_TARGETS="${GROUP3_TARGETS_STRING}" \
|
||||
-e GROUP4_TARGETS="${GROUP4_TARGETS_STRING}" \
|
||||
-v "${WORKSPACE_ROOT_HOST}:/workspace" \
|
||||
-v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \
|
||||
-v "${CONTAINER_SCRIPT_HOST}:/tmp/run-build-inside-container.sh:ro" \
|
||||
|
||||
Reference in new issue
Block a user