AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/init-stage2: always set XDG_RUNTIME_DIR

Browse Source 
This seems to be needed now that we compile mesa with wayland support.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21872>
This commit is contained in:
Martin Roukala (né Peres)
2023-03-14 10:48:41 +02:00
committed by Marge Bot
parent 226c247945
commit a0d8ed757e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,9 @@ 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
@@ -152,8 +155,6 @@ if [ -n "$HWCI_START_WESTON" ]; then
echo "Please consider dropping HWCI_START_XORG and instead using Weston XWayland for testing."
WESTON_X11_SOCK="/tmp/.X11-unix/X1"
fi
export XDG_RUNTIME_DIR=/run/user
mkdir -p $XDG_RUNTIME_DIR
export WAYLAND_DISPLAY=wayland-0
# Display server is Weston Xwayland when HWCI_START_XORG is not set or Xorg when it's