Module: Mesa Branch: main Commit: fb3632d24f41afda9ab4fc7e96019ea8b32ae59d URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=fb3632d24f41afda9ab4fc7e96019ea8b32ae59d
Author: David Heidelberg <[email protected]> Date: Sat Mar 18 14:49:59 2023 +0100 ci: distribute XDG_RUNTIME_DIR with setup-test-env script Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8615 Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8646 Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Martin Roukala <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22004> --- .gitlab-ci/common/init-stage2.sh | 3 --- .gitlab-ci/crosvm-init.sh | 3 --- .gitlab-ci/setup-test-env.sh | 3 +++ src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index 22a8874c293..833d23d8f88 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -125,9 +125,6 @@ fi /capture-devcoredump.sh & BACKGROUND_PIDS="$! $BACKGROUND_PIDS" -export XDG_RUNTIME_DIR=/run/user -mkdir -p $XDG_RUNTIME_DIR - # If we want Xorg to be running for the test, then we start it up before the # HWCI_TEST_SCRIPT because we need to use xinit to start X (otherwise # without using -displayfd you can race with Xorg's startup), but xinit will eat diff --git a/.gitlab-ci/crosvm-init.sh b/.gitlab-ci/crosvm-init.sh index ac5eb1b9ea6..d2b67fbd428 100755 --- a/.gitlab-ci/crosvm-init.sh +++ b/.gitlab-ci/crosvm-init.sh @@ -15,9 +15,6 @@ mount -t tmpfs tmpfs /tmp . ${VM_TEMP_DIR}/crosvm-env.sh . ${VM_TEMP_DIR}/setup-test-env.sh -# Required by the wayland platform -export XDG_RUNTIME_DIR=$(mktemp -d) - # .gitlab-ci.yml script variable is using relative paths to install directory, # so change to that dir before running `crosvm-script` cd "${CI_PROJECT_DIR}" diff --git a/.gitlab-ci/setup-test-env.sh b/.gitlab-ci/setup-test-env.sh index 8f61f9b0c6f..b066b3b3d9c 100644 --- a/.gitlab-ci/setup-test-env.sh +++ b/.gitlab-ci/setup-test-env.sh @@ -93,5 +93,8 @@ export -f section_end export -f section_switch export -f uncollapsed_section_switch +# Freedesktop requirement (needed for Wayland) +[ -n "${XDG_RUNTIME_DIR}" ] || export XDG_RUNTIME_DIR="$(mktemp -p "$PWD" -d xdg-runtime-XXXXXX)" + set -E trap 'trap_err $?' ERR diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index fef30e7de3c..40963bd0554 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -64,14 +64,12 @@ llvmpipe-traces: llvmpipe: variables: DEQP_SUITE: llvmpipe - XDG_RUNTIME_DIR: /run/user XVFB_SCRIPT: "install/deqp-runner.sh" DEQP_FRACTION: 4 extends: .llvmpipe-deqp-test script: | . "$SCRIPTS_DIR"/setup-test-env.sh section_start weston "weston: prepare" - mkdir -p $XDG_RUNTIME_DIR LD_LIBRARY_PATH=`pwd`/install weston -Bheadless-backend.so -Swayland-0 & section_end weston LD_LIBRARY_PATH=`pwd`/install WAYLAND_DISPLAY=wayland-0 xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}"
