File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -12,8 +12,6 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
1212 python3 \
1313 ruby \
1414 ruby-dev \
15- curl \
16- ca-certificates \
1715 libpng-dev \
1816 libjpeg-dev \
1917 libfreetype-dev \
@@ -42,8 +40,9 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get update && apt-get install -y \
4240 && rm -rf /var/lib/apt/lists/*
4341
4442# Rust toolchain for gst-plugins-rs (webrtcsrc / signaller binaries)
45- RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile minimal
46- ENV PATH="/root/.cargo/bin:${PATH}"
43+ RUN DEBIAN_FRONTEND="noninteractive" apt-get update \
44+ && apt-get install -y cargo rustc \
45+ && rm -rf /var/lib/apt/lists/*
4746
4847# Pre-build gst-plugins-rs WebRTC plugins into the image
4948COPY tests/scripts/build_gst_plugins_rs.sh /build_gst_plugins_rs.sh
Original file line number Diff line number Diff line change @@ -13,6 +13,8 @@ set(LVGL_TEST_DIR "${LVGL_DIR}/tests")
1313# ---------------------------------------------------------------------------
1414# lv_conf.h generation — reuse the parent repo's machinery
1515# ---------------------------------------------------------------------------
16+ find_package (Python3 REQUIRED COMPONENTS Interpreter )
17+
1618set (LV_CONF_DEFAULTS_PATH "${CMAKE_SOURCE_DIR } /../lv_conf.defaults" )
1719set (LVGL_TEMPLATE_PATH "${LVGL_DIR} /lv_conf_template.h" )
1820set (GENERATE_SCRIPT_PATH "${LVGL_DIR} /scripts/generate_lv_conf.py" )
@@ -301,7 +303,7 @@ target_link_libraries(${TEST_NAME} PRIVATE
301303 test_common
302304 lvgl_demos
303305 lvgl
304- lvgl_thorvg
306+ $<$< TARGET_EXISTS : lvgl_thorvg >: lvgl_thorvg >
305307 ${PNG_LIBRARIES}
306308 ${FREETYPE_LIBRARIES}
307309 ${JPEG_LIBRARIES}
Original file line number Diff line number Diff line change @@ -64,11 +64,17 @@ echo "[INFO] Starting local WebRTC signaller"
6464" ${SIGNALLER_BIN} " --port " ${SIGNALLER_PORT} " > " ${LOG_DIR} /signaller.log" 2>&1 &
6565SIGNALLER_PID=$!
6666sleep 2
67+ if ! kill -0 " ${SIGNALLER_PID} " 2> /dev/null; then
68+ fail_with_log " signaller startup" " ${LOG_DIR} /signaller.log"
69+ fi
6770
6871echo " [INFO] Starting sender pipeline"
6972gst-launch-1.0 -e ${SENDER_PIPELINE} > " ${LOG_DIR} /sender.log" 2>&1 &
7073SENDER_PID=$!
7174sleep 2
75+ if ! kill -0 " ${SENDER_PID} " 2> /dev/null; then
76+ fail_with_log " sender pipeline startup" " ${LOG_DIR} /sender.log"
77+ fi
7278
7379BUILD_DIR=" ${ROOT_DIR} /build-gstreamer-tests"
7480rm -rf " ${BUILD_DIR} "
You can’t perform that action at this time.
0 commit comments