Module: Mesa Branch: main Commit: 720812f3539a1d88003a50c1af05add1f3e8697e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=720812f3539a1d88003a50c1af05add1f3e8697e
Author: Eric Engestrom <[email protected]> Date: Mon Feb 6 18:46:31 2023 +0000 ci/android: move virgl-specific deqp suite to virgl-defined variables Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Helen Koike <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21157> --- .gitlab-ci/cuttlefish-runner.sh | 5 ++--- src/gallium/drivers/virgl/ci/gitlab-ci.yml | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh index fe81b0db3b4..c547c47f476 100755 --- a/.gitlab-ci/cuttlefish-runner.sh +++ b/.gitlab-ci/cuttlefish-runner.sh @@ -56,7 +56,7 @@ tar -xvf ${MINIO_ARTIFACT_NAME}.tar.zst $ADB push install/all-skips.txt /data/. $ADB push install/$GPU_VERSION-flakes.txt /data/. -$ADB push install/deqp-android-virgl.toml /data/. +$ADB push install/deqp-$DEQP_SUITE.toml /data/. # remove 32 bits libs from /vendor/lib @@ -87,11 +87,10 @@ $ADB shell rm /vendor/lib64/egl/libGLESv2_emulation.so # run tests RESULTS=/data/results -DEQP_SUITE=/data/deqp-android-virgl.toml $ADB shell "mkdir /data/results; cd /data; strace -o /data/results/out.strace -f -s 1000 ./deqp-runner \ suite \ - --suite $DEQP_SUITE \ + --suite /data/deqp-$DEQP_SUITE.toml \ --output $RESULTS \ --skips /data/all-skips.txt $DEQP_SKIPS \ --flakes /data/$GPU_VERSION-flakes.txt \ diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci.yml b/src/gallium/drivers/virgl/ci/gitlab-ci.yml index f0f62a4022d..0772383f339 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci.yml @@ -112,3 +112,4 @@ android-virgl-llvmpipe: variables: ANDROID_GPU_MODE: drm_virgl GPU_VERSION: virgl-gl + DEQP_SUITE: android-virgl
