Skip to content

Commit 88afca7

Browse files
authored
Merge pull request #401 from smuppand/Display
Fail weston-simple-egl on base when Weston runtime is missing
2 parents e421daa + 29cad9c commit 88afca7

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

  • Runner/suites/Multimedia/Graphics/weston-simple-egl

Runner/suites/Multimedia/Graphics/weston-simple-egl/run.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ if [ -z "$sock" ]; then
207207
log_warn "overlay_start_weston_drm returned non-zero; private Weston may have failed to start."
208208
fi
209209
else
210-
log_warn "No Wayland socket found and not starting Weston on base build; skipping ${TESTNAME}."
211-
echo "${TESTNAME} SKIP" >"$RES_FILE"
210+
log_fail "No Wayland socket found and not starting Weston on base build, failing ${TESTNAME}."
211+
echo "${TESTNAME} FAIL" >"$RES_FILE"
212212
exit 0
213213
fi
214214
fi
@@ -219,10 +219,10 @@ if command -v discover_wayland_socket_anywhere >/dev/null 2>&1; then
219219
[ -n "$new_sock" ] && sock="$new_sock"
220220
fi
221221

222-
# Final decision: run or SKIP
222+
# Final decision: run or FAIL
223223
if [ -z "$sock" ]; then
224-
log_warn "No Wayland socket found after autodetection; skipping ${TESTNAME}."
225-
echo "${TESTNAME} SKIP" >"$RES_FILE"
224+
log_fail "No Wayland socket found after autodetection, failing ${TESTNAME}."
225+
echo "${TESTNAME} FAIL" >"$RES_FILE"
226226
exit 0
227227
fi
228228

@@ -237,7 +237,7 @@ fi
237237
if command -v wayland_connection_ok >/dev/null 2>&1; then
238238
if ! wayland_connection_ok; then
239239
if [ "$BUILD_FLAVOUR" = "base" ] && command -v weston_wait_ready >/dev/null 2>&1; then
240-
log_warn "Initial Wayland connection test failed; waiting briefly and retrying..."
240+
log_warn "Initial Wayland connection test failed, waiting briefly and retrying..."
241241
if weston_wait_ready 5; then
242242
if command -v discover_wayland_socket_anywhere >/dev/null 2>&1; then
243243
sock=$(discover_wayland_socket_anywhere | head -n 1 || true)
@@ -249,8 +249,8 @@ if command -v wayland_connection_ok >/dev/null 2>&1; then
249249
fi
250250

251251
if ! wayland_connection_ok; then
252-
log_fail "Wayland connection test failed; cannot run ${TESTNAME}."
253-
echo "${TESTNAME} SKIP" >"$RES_FILE"
252+
log_fail "Wayland connection test failed, cannot run ${TESTNAME}."
253+
echo "${TESTNAME} FAIL" >"$RES_FILE"
254254
exit 0
255255
fi
256256
fi

0 commit comments

Comments
 (0)