summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorEric Engestrom <eric@igalia.com>2023-02-06 18:46:31 +0000
committerMarge Bot <emma+marge@anholt.net>2023-02-07 16:28:35 +0000
commit720812f3539a1d88003a50c1af05add1f3e8697e (patch)
tree90d0a6a94ab14ee8eed80c5e73684a9a9d889f97 /.gitlab-ci
parentb9cdcd2cbe85bc10c8da7d0e3175bd352034b1aa (diff)
downloadmesa-720812f3539a1d88003a50c1af05add1f3e8697e.tar.gz
mesa-720812f3539a1d88003a50c1af05add1f3e8697e.tar.bz2
mesa-720812f3539a1d88003a50c1af05add1f3e8697e.zip
ci/android: move virgl-specific deqp suite to virgl-defined variables
Signed-off-by: Eric Engestrom <eric@igalia.com> Reviewed-by: Helen Koike <helen.koike@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21157>
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/cuttlefish-runner.sh5
1 files changed, 2 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 \