From cc6484f1641ca905074ad48b7def844540075643 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Sun, 17 Nov 2019 11:28:16 -0800 Subject: [PATCH] gitlab-ci/deqp: preserve caselists for blocks with fails Bump cts_runner to pick up the change to preserve .qpa and caselist .txt files for blocks of tests that contain fails, and preserve the caselist files. To reproduce fails that depend on order of running tests, these are useful. Signed-off-by: Rob Clark Acked-by: Eric Engestrom --- .gitlab-ci/build-cts-runner.sh | 6 +++--- .gitlab-ci/deqp-runner.sh | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/build-cts-runner.sh b/.gitlab-ci/build-cts-runner.sh index 2622819f2e5..c4d8bd878f3 100644 --- a/.gitlab-ci/build-cts-runner.sh +++ b/.gitlab-ci/build-cts-runner.sh @@ -2,9 +2,9 @@ set -ex -git clone https://github.com/anholt/cts_runner.git --depth 1 -b anholt-mesa-ci-2 -cd cts_runner +git clone https://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git --depth 1 +cd parallel-deqp-runner meson build/ ninja -C build -j4 install cd .. -rm -rf cts_runner +rm -rf parallel-deqp-runner diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 9a18c9fc6ce..58aa7759b7a 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -69,6 +69,8 @@ vulkan-cts-runner \ DEQP_EXITCODE=$? if [ $DEQP_EXITCODE -ne 0 ]; then + # preserve caselist files in case of failures: + cp /tmp/cts_runner.*.txt $RESULTS/ echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):" cat $RESULTS/cts-runner-results.txt | \ grep -v ",Pass" | \ -- 2.11.0