OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: distribute XDG_RUNTIME_DIR with setup-test-env script

Browse Source 
Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8615
Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8646

Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Martin Roukala <martin.roukala@mupuf.org>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22004>
This commit is contained in:
David Heidelberg
2023-03-18 14:49:59 +01:00
parent 210c6c11cc
commit fb3632d24f
4 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/common/init-stage2.sh
View File

@@ -125,9 +125,6 @@ fi
/capture-devcoredump.sh & /capture-devcoredump.sh &
BACKGROUND_PIDS="$! $BACKGROUND_PIDS" 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 # 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 # 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 # without using -displayfd you can race with Xorg's startup), but xinit will eat

3
.gitlab-ci/crosvm-init.sh
View File

@@ -15,9 +15,6 @@ mount -t tmpfs tmpfs /tmp
. ${VM_TEMP_DIR}/crosvm-env.sh . ${VM_TEMP_DIR}/crosvm-env.sh
. ${VM_TEMP_DIR}/setup-test-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, # .gitlab-ci.yml script variable is using relative paths to install directory,
# so change to that dir before running `crosvm-script` # so change to that dir before running `crosvm-script`
cd "${CI_PROJECT_DIR}" cd "${CI_PROJECT_DIR}"

3
.gitlab-ci/setup-test-env.sh
View File

@@ -93,5 +93,8 @@ export -f section_end
export -f section_switch export -f section_switch
export -f uncollapsed_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 set -E
trap 'trap_err $?' ERR trap 'trap_err $?' ERR

2
src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
View File

@@ -64,14 +64,12 @@ llvmpipe-traces:
llvmpipe: llvmpipe:
variables: variables:
DEQP_SUITE: llvmpipe DEQP_SUITE: llvmpipe
XDG_RUNTIME_DIR: /run/user
XVFB_SCRIPT: "install/deqp-runner.sh" XVFB_SCRIPT: "install/deqp-runner.sh"
DEQP_FRACTION: 4 DEQP_FRACTION: 4
extends: .llvmpipe-deqp-test extends: .llvmpipe-deqp-test
script: | script: |
. "$SCRIPTS_DIR"/setup-test-env.sh . "$SCRIPTS_DIR"/setup-test-env.sh
section_start weston "weston: prepare" section_start weston "weston: prepare"
mkdir -p $XDG_RUNTIME_DIR
LD_LIBRARY_PATH=`pwd`/install weston -Bheadless-backend.so -Swayland-0 & LD_LIBRARY_PATH=`pwd`/install weston -Bheadless-backend.so -Swayland-0 &
section_end weston 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}" LD_LIBRARY_PATH=`pwd`/install WAYLAND_DISPLAY=wayland-0 xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}"