fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 05:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/crosvm: remove noise inside deqp-runner output

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32156>
This commit is contained in:
Eric Engestrom 2024-11-15 13:12:14 +01:00 • committed by Marge Bot
parent 8d3f2d2c23
commit ad4e5538ba
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.gitlab-ci/crosvm-runner.sh
View file

@ -102,7 +102,12 @@ CROSVM_KERN_ARGS="${CROSVM_KERN_ARGS} init=${SCRIPTS_DIR}/crosvm-init.sh -- ${VS
[ "${CROSVM_GALLIUM_DRIVER:-}" = "llvmpipe" ] && \ [ "${CROSVM_GALLIUM_DRIVER:-}" = "llvmpipe" ] && \
CROSVM_LIBGL_ALWAYS_SOFTWARE=true || CROSVM_LIBGL_ALWAYS_SOFTWARE=false CROSVM_LIBGL_ALWAYS_SOFTWARE=true || CROSVM_LIBGL_ALWAYS_SOFTWARE=false
set +e -x set +e
if [ "${INSIDE_DEQP_RUNNER:-}" != "true" ]
then
set -x
fi
# We aren't testing the host driver here, so we don't need to validate NIR on the host # We aren't testing the host driver here, so we don't need to validate NIR on the host
NIR_DEBUG="novalidate" \ NIR_DEBUG="novalidate" \
@ -129,7 +134,7 @@ CROSVM_RET=$?
# Show crosvm output on error to help with debugging # Show crosvm output on error to help with debugging
[ ${CROSVM_RET} -eq 0 ] || { [ ${CROSVM_RET} -eq 0 ] || {
set +x { set +x; } 2>/dev/null
echo "Dumping crosvm output.." >&2 echo "Dumping crosvm output.." >&2
cat ${VM_TEMP_DIR}/crosvm >&2 cat ${VM_TEMP_DIR}/crosvm >&2
set -x set -x

8
src/gallium/drivers/virgl/ci/deqp-virgl-gl.toml
View file

@ -12,6 +12,8 @@ deqp_args = [
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
version_check = "GL ES 3.2.*git" version_check = "GL ES 3.2.*git"
renderer_check = "virgl.*LLVMPIPE" renderer_check = "virgl.*LLVMPIPE"
[deqp.env]
INSIDE_DEQP_RUNNER = "true"
[[deqp]] [[deqp]]
deqp = "/install/crosvm-runner.sh" deqp = "/install/crosvm-runner.sh"
@ -25,6 +27,8 @@ deqp_args = [
"--deqp-visibility=hidden" "--deqp-visibility=hidden"
] ]
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
[deqp.env]
INSIDE_DEQP_RUNNER = "true"
[[deqp]] [[deqp]]
deqp = "/install/crosvm-runner.sh" deqp = "/install/crosvm-runner.sh"
@ -38,6 +42,8 @@ deqp_args = [
"--deqp-visibility=hidden" "--deqp-visibility=hidden"
] ]
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
[deqp.env]
INSIDE_DEQP_RUNNER = "true"
[[deqp]] [[deqp]]
deqp = "/install/crosvm-runner.sh" deqp = "/install/crosvm-runner.sh"
@ -53,3 +59,5 @@ deqp_args = [
"--deqp-visibility=hidden" "--deqp-visibility=hidden"
] ]
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
[deqp.env]
INSIDE_DEQP_RUNNER = "true"

8
src/gallium/drivers/virgl/ci/deqp-virgl-gles.toml
View file

@ -12,6 +12,8 @@ deqp_args = [
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
version_check = "GL ES 3.2.*git" version_check = "GL ES 3.2.*git"
renderer_check = "virgl.*LLVMPIPE" renderer_check = "virgl.*LLVMPIPE"
[deqp.env]
INSIDE_DEQP_RUNNER = "true"
[[deqp]] [[deqp]]
deqp = "/install/crosvm-runner.sh" deqp = "/install/crosvm-runner.sh"
@ -25,6 +27,8 @@ deqp_args = [
"--deqp-visibility=hidden" "--deqp-visibility=hidden"
] ]
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
[deqp.env]
INSIDE_DEQP_RUNNER = "true"
[[deqp]] [[deqp]]
deqp = "/install/crosvm-runner.sh" deqp = "/install/crosvm-runner.sh"
@ -38,6 +42,8 @@ deqp_args = [
"--deqp-visibility=hidden" "--deqp-visibility=hidden"
] ]
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
[deqp.env]
INSIDE_DEQP_RUNNER = "true"
[[deqp]] [[deqp]]
deqp = "/install/crosvm-runner.sh" deqp = "/install/crosvm-runner.sh"
@ -53,3 +59,5 @@ deqp_args = [
"--deqp-visibility=hidden" "--deqp-visibility=hidden"
] ]
timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time timeout = 360.0 # Starting 8 Crosvm instances simultaneously can take some time
[deqp.env]
INSIDE_DEQP_RUNNER = "true"