0fa3170504
* Skip shell tests when the compositor can't be reached, not just when WAYLAND_DISPLAY is unset A set variable only proves the environment was inherited. Sandboxes pass it through while blocking $XDG_RUNTIME_DIR, so Quickshell cleared the guard and aborted inside QGuiApplication, leaving two core dumps per launch instead of a clean skip. Probe the socket and, when there's a signature to ask with, Hyprland itself. Disable core dumps on the way through for the compositor that dies mid-run, which no probe can catch. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> * Retry the compositor query before calling it dead Hyprland can miss a query while it reconfigures outputs, and one miss was enough to skip a whole file's runtime coverage. Retry the way omarchy-launch-shell does. Only a leftover socket reaches the query at all, so the ordinary skip still returns immediately. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
74 lines
2.0 KiB
Bash
Executable File
74 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
TMPDIR=""
|
|
QS_PID=""
|
|
|
|
cleanup() {
|
|
if [[ -n $QS_PID ]] && kill -0 "$QS_PID" 2>/dev/null; then
|
|
kill "$QS_PID" 2>/dev/null || true
|
|
wait "$QS_PID" 2>/dev/null || true
|
|
fi
|
|
if [[ -n $TMPDIR && -d $TMPDIR ]]; then
|
|
rm -rf "$TMPDIR"
|
|
fi
|
|
}
|
|
trap cleanup EXIT
|
|
|
|
require_compositor "lock fingerprint indicator test"
|
|
|
|
if ! command -v quickshell >/dev/null 2>&1; then
|
|
pass "quickshell not installed; skipping lock fingerprint indicator test"
|
|
exit 0
|
|
fi
|
|
|
|
require_command jq
|
|
|
|
TMPDIR=$(mktemp -d)
|
|
result="$TMPDIR/result.json"
|
|
log="$TMPDIR/quickshell.log"
|
|
config_dir="$TMPDIR/lock-fingerprint-indicator"
|
|
mkdir -p "$config_dir" "$TMPDIR/home"
|
|
cp "$SHELL_TEST_DIR/fixtures/lock-fingerprint-indicator/shell.qml" "$config_dir/shell.qml"
|
|
ln -s "$ROOT/shell/Ui" "$config_dir/Ui"
|
|
ln -s "$ROOT/shell/Commons" "$config_dir/Commons"
|
|
|
|
OMARCHY_PATH="$ROOT" \
|
|
OMARCHY_QML_TEST_RESULT="$result" \
|
|
HOME="$TMPDIR/home" \
|
|
XDG_CONFIG_HOME="$TMPDIR/home/.config" \
|
|
XDG_CACHE_HOME="$TMPDIR/home/.cache" \
|
|
XDG_STATE_HOME="$TMPDIR/home/.local/state" \
|
|
QML2_IMPORT_PATH="$ROOT/shell${QML2_IMPORT_PATH:+:$QML2_IMPORT_PATH}" \
|
|
QML_IMPORT_PATH="$ROOT/shell${QML_IMPORT_PATH:+:$QML_IMPORT_PATH}" \
|
|
PATH="$ROOT/bin:$PATH" \
|
|
quickshell -p "$config_dir" --no-color >"$log" 2>&1 &
|
|
QS_PID=$!
|
|
|
|
for _ in {1..80}; do
|
|
[[ -s $result ]] && break
|
|
if ! kill -0 "$QS_PID" 2>/dev/null; then
|
|
sed -n '1,220p' "$log" >&2
|
|
fail "lock fingerprint indicator quickshell exited before writing result"
|
|
fi
|
|
sleep 0.1
|
|
done
|
|
|
|
[[ -s $result ]] || {
|
|
sed -n '1,220p' "$log" >&2
|
|
fail "lock fingerprint indicator test timed out"
|
|
}
|
|
|
|
if ! jq -e '.ok == true' "$result" >/dev/null; then
|
|
printf 'Lock fingerprint indicator result:\n' >&2
|
|
jq . "$result" >&2
|
|
printf 'Lock fingerprint indicator log:\n' >&2
|
|
sed -n '1,220p' "$log" >&2
|
|
fail "fingerprint indicator tracks the configured sensor"
|
|
fi
|
|
|
|
pass "fingerprint indicator tracks the configured sensor"
|