[#709] Delegate to CI shell script to build e2e test dependencies

orecham · orecham · commit f0ad188d30ab · 2025-09-18T14:42:33.000+02:00
diff --git a/iceoryx2-cli/iox2-config/end-to-end-tests/test_e2e_iox2_config_generate_local.exp b/iceoryx2-cli/iox2-config/end-to-end-tests/test_e2e_iox2_config_generate_local.exp
@@ -22,8 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --bin iox2-config -- generate local --force
diff --git a/iceoryx2-cli/iox2-config/end-to-end-tests/test_e2e_iox2_config_show_current.exp b/iceoryx2-cli/iox2-config/end-to-end-tests/test_e2e_iox2_config_show_current.exp
@@ -22,8 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --bin iox2-config -- show current
diff --git a/iceoryx2-cli/iox2-config/end-to-end-tests/test_e2e_iox2_config_show_system.exp b/iceoryx2-cli/iox2-config/end-to-end-tests/test_e2e_iox2_config_show_system.exp
@@ -22,8 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --bin iox2-config -- show system
diff --git a/iceoryx2-cli/iox2-node/end-to-end-tests/test_e2e_iox2_node_details.exp b/iceoryx2-cli/iox2-node/end-to-end-tests/test_e2e_iox2_node_details.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 # Spawn a process that creates a node
diff --git a/iceoryx2-cli/iox2-node/end-to-end-tests/test_e2e_iox2_node_list.exp b/iceoryx2-cli/iox2-node/end-to-end-tests/test_e2e_iox2_node_list.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --example publish_subscribe_subscriber
diff --git a/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_details.exp b/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_details.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 # Spawn a process that creates a service
diff --git a/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_discovery.exp b/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_discovery.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --bin iox2-service discovery
diff --git a/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_discovery_detailed.exp b/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_discovery_detailed.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --bin iox2-service discovery --detailed
diff --git a/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_list.exp b/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_list.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --example publish_subscribe_subscriber
diff --git a/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_listen.exp b/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_listen.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --example event_notifier
diff --git a/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_notify.exp b/iceoryx2-cli/iox2-service/end-to-end-tests/test_e2e_iox2_service_notify.exp
@@ -22,9 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p example 2>@1
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --example event_listener
diff --git a/iceoryx2-cli/iox2/end-to-end-tests/test_e2e_iox2_list.exp b/iceoryx2-cli/iox2/end-to-end-tests/test_e2e_iox2_list.exp
@@ -22,8 +22,6 @@ source ${REPO_ROOT}/iceoryx2-testing/end-to-end-testing/common.exp
 
 set timeout 10
 
-exec cargo build -p iceoryx2-cli 2>@1
-
 #### Test
 
 spawn cargo run --bin iox2 -- --list
diff --git a/internal/scripts/ci_build_and_run_end_to_end_tests.sh b/internal/scripts/ci_build_and_run_end_to_end_tests.sh
@@ -62,7 +62,15 @@ if [[ ${BUILD_END_TO_END_TESTS} == true ]]; then
     echo "##########################"
 
     cargo build --examples
+
+    # for some reason, cargo run --bin will rebuild these binaries
+    # if not built directly here ... cargo build -p iceoryx2-cli is
+    # not sufficient
+    cargo build --bin iox2
+    cargo build --bin iox2-config
     cargo build --bin iox2-service
+    cargo build --bin iox2-node
+    cargo build --bin iox2-tunnel
 
     NUM_JOBS=1
     if [[ "$OSTYPE" == "linux-gnu"* ]] || [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]]; then
