ci: allow starting xorg for piglit run
And enable it in the radv's Raven traces job. v2: - Adapt to changes in the start-x.sh script. v3: - Not deleting any more the non-existent by now ".gitlab-ci/common/start-x.sh" script (Martin). Signed-off-by: Andres Gomez <agomez@igalia.com> Reviewed-by: Martin Peres <martin.peres@mupuf.org> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10856>
This commit is contained in:
parent
3f2449ec5f
commit
be05fecca0
|
@ -17,6 +17,21 @@ export __LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$INSTALL/lib/"
|
||||||
# run against the Mesa built by CI, rather than any installed distro version.
|
# run against the Mesa built by CI, rather than any installed distro version.
|
||||||
MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')
|
MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g')
|
||||||
|
|
||||||
|
print_red() {
|
||||||
|
RED='\033[0;31m'
|
||||||
|
NC='\033[0m' # No Color
|
||||||
|
printf "${RED}"
|
||||||
|
"$@"
|
||||||
|
printf "${NC}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# wrapper to supress +x to avoid spamming the log
|
||||||
|
quiet() {
|
||||||
|
set +x
|
||||||
|
"$@"
|
||||||
|
set -x
|
||||||
|
}
|
||||||
|
|
||||||
if [ "$VK_DRIVER" ]; then
|
if [ "$VK_DRIVER" ]; then
|
||||||
|
|
||||||
### VULKAN ###
|
### VULKAN ###
|
||||||
|
@ -43,15 +58,18 @@ if [ "$VK_DRIVER" ]; then
|
||||||
|
|
||||||
# Set up the Window System Interface (WSI)
|
# Set up the Window System Interface (WSI)
|
||||||
|
|
||||||
# IMPORTANT:
|
if [ ${TEST_START_XORG:-0} -eq 1 ]; then
|
||||||
#
|
"$INSTALL"/common/start-x.sh "$INSTALL"
|
||||||
# Nothing to do here.
|
export DISPLAY=:0
|
||||||
#
|
else
|
||||||
# Run vulkan against the host's running X server (xvfb doesn't
|
# Run vulkan against the host's running X server (xvfb doesn't
|
||||||
# have DRI3 support).
|
# have DRI3 support).
|
||||||
# Set the DISPLAY env variable in each gitlab-runner's
|
# Set the DISPLAY env variable in each gitlab-runner's
|
||||||
# configuration file:
|
# configuration file:
|
||||||
# https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section
|
# https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section
|
||||||
|
quiet printf "%s%s\n" "Running against the hosts' X server. " \
|
||||||
|
"DISPLAY is \"$DISPLAY\"."
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
|
|
||||||
### GL/ES ###
|
### GL/ES ###
|
||||||
|
@ -120,21 +138,6 @@ if [ -n "$CI_NODE_INDEX" ]; then
|
||||||
USE_CASELIST=1
|
USE_CASELIST=1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
print_red() {
|
|
||||||
RED='\033[0;31m'
|
|
||||||
NC='\033[0m' # No Color
|
|
||||||
printf "${RED}"
|
|
||||||
"$@"
|
|
||||||
printf "${NC}"
|
|
||||||
}
|
|
||||||
|
|
||||||
# wrapper to supress +x to avoid spamming the log
|
|
||||||
quiet() {
|
|
||||||
set +x
|
|
||||||
"$@"
|
|
||||||
set -x
|
|
||||||
}
|
|
||||||
|
|
||||||
replay_minio_upload_images() {
|
replay_minio_upload_images() {
|
||||||
find "$RESULTS/$__PREFIX" -type f -name "*.png" -printf "%P\n" \
|
find "$RESULTS/$__PREFIX" -type f -name "*.png" -printf "%P\n" \
|
||||||
| while read -r line; do
|
| while read -r line; do
|
||||||
|
|
Loading…
Reference in New Issue