CI(pico-sensor): tunnel ID can now be set directly in the pipeline
This commit is contained in:
@@ -23,9 +23,11 @@ pico-sensor-docker-build:
|
||||
pico-sensor-test:
|
||||
stage: test
|
||||
image: registry.forge.hefr.ch/team-raclette/project-softweng/pico-sensor:latest
|
||||
variables:
|
||||
TUNNEL_ID: "801000372" # Tunnel ID to reach the pico-sensor device
|
||||
script:
|
||||
- cd pico-sensor
|
||||
- cmake --preset Test
|
||||
- cmake --preset Test -DTUNNEL_ID=$TUNNEL_ID
|
||||
- cmake --build --preset app-test
|
||||
- cd build/Test
|
||||
- ctest -T test --output-on-failure --output-junit test-results.xml -R ^DUMMY$
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
# Need to include CTest on every CMakeLists.txt which is going to use tests
|
||||
include(CTest)
|
||||
set(TUNNEL_ID "" CACHE STRING "Tunnel ID for JRun") # Default is empty
|
||||
|
||||
set(THIS_LIBRARY_NAME srcTestsLib)
|
||||
|
||||
@@ -33,9 +34,17 @@ target_include_directories(
|
||||
PUBLIC
|
||||
.
|
||||
)
|
||||
|
||||
# Add tunnel ID if provided by user during cmake command execution
|
||||
if(TUNNEL_ID)
|
||||
set(JRUN_IP_ARG --ip "tunnel:${TUNNEL_ID}")
|
||||
else()
|
||||
set(JRUN_IP_ARG)
|
||||
endif()
|
||||
|
||||
#################################################################################
|
||||
# Note: --pc off --sp off are needed, if application runs from the ROM bootloader, might add --verbose
|
||||
set (JRUN_CTEST_COMMAND "JRun" --device RP2040_M0_0 --rtt -if SWD --pc off --sp off --ip "tunnel:801000372")
|
||||
set(JRUN_CTEST_COMMAND "JRun" --device RP2040_M0_0 --rtt -if SWD --pc off --sp off ${JRUN_IP_ARG})
|
||||
|
||||
add_test(
|
||||
NAME Led
|
||||
@@ -60,5 +69,5 @@ add_test(
|
||||
set_tests_properties(
|
||||
Led Sensor DNS
|
||||
PROPERTIES
|
||||
TIMEOUT 30
|
||||
TIMEOUT 50
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user