Merge branch 'use-pixman-renderer'

This commit is contained in:
Daniel Eklöf 2021-10-09 12:30:25 +02:00
commit 7704bea876
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 2 additions and 2 deletions

View file

@ -8,7 +8,7 @@ blddir=$(realpath "${2}")
runtime_dir=$(mktemp -d)
trap "rm -rf '${runtime_dir}'" EXIT INT HUP TERM
XDG_RUNTIME_DIR="${runtime_dir}" WLR_BACKENDS=headless cage "${srcdir}"/pgo/full-inner.sh "${srcdir}" "${blddir}"
XDG_RUNTIME_DIR="${runtime_dir}" WLR_RENDERER=pixman WLR_BACKENDS=headless cage "${srcdir}"/pgo/full-inner.sh "${srcdir}" "${blddir}"
# Cages exit code doesnt reflect our scripts exit code
[ -f "${blddir}"/pgo-ok ] || exit 1

View file

@ -18,7 +18,7 @@ trap cleanup EXIT INT HUP TERM
> "${sway_conf}" echo "exec '${srcdir}'/pgo/full-headless-sway-inner.sh '${srcdir}' '${blddir}'"
# Run Sway. full-headless-sway-inner.sh ends with a swaymsg exit
XDG_RUNTIME_DIR="${runtime_dir}" WLR_BACKENDS=headless sway -c "${sway_conf}"
XDG_RUNTIME_DIR="${runtime_dir}" WLR_RENDERER=pixman WLR_BACKENDS=headless sway -c "${sway_conf}"
# Sways exit code doesnt reflect our scripts exit code
[ -f "${blddir}"/pgo-ok ] || exit 1