From ed48d1cb53fb7645e43fdd88bada42edf76a8705 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Wed, 6 Sep 2023 08:40:53 +0200
Subject: [PATCH] zink/ci: merge piglit testing with deqp-runner for RADV

This avoids using an extra script to run GLCTS+piglit.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25062>
---
 .gitlab-ci/valve/gl_combined_testing.sh       | 23 -------------------
 .../drivers/zink/ci/deqp-zink-radv.toml       | 10 ++++++++
 src/gallium/drivers/zink/ci/gitlab-ci.yml     |  5 ++--
 3 files changed, 12 insertions(+), 26 deletions(-)
 delete mode 100755 .gitlab-ci/valve/gl_combined_testing.sh

diff --git a/.gitlab-ci/valve/gl_combined_testing.sh b/.gitlab-ci/valve/gl_combined_testing.sh
deleted file mode 100755
index c8f8d05e6d6..00000000000
--- a/.gitlab-ci/valve/gl_combined_testing.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-function execute_testsuite {
-    local RESULTS_FOLDER EXEC_DONE_FILE
-
-    RESULTS_FOLDER="results/$1"
-    EXEC_DONE_FILE="$RESULTS_FOLDER/.done"
-
-    if [ ! -f "$EXEC_DONE_FILE" ]; then
-        DEQP_RESULTS_DIR="$RESULTS_FOLDER" PIGLIT_RESULTS_DIR="$RESULTS_FOLDER" $2
-        touch "$EXEC_DONE_FILE"
-    else
-        echo "--> Skipped, as it already was executed"
-    fi
-}
-
-echo -e "\n# GLES/GL CTS testing"
-DEQP_SUITE=zink-radv execute_testsuite gles ./install/deqp-runner.sh
-
-echo -e "\n# Piglit testing"
-execute_testsuite piglit ./install/piglit/piglit-runner.sh
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
index cd571a33808..28272c379f0 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
+++ b/src/gallium/drivers/zink/ci/deqp-zink-radv.toml
@@ -47,3 +47,13 @@ deqp_args = [
     "--deqp-visibility=hidden"
 ]
 timeout = 180.0
+
+[[piglit]]
+piglit_folder = "/piglit"
+profile = "gpu"
+process_isolation = true
+timeout = 180.0
+  [piglit.env]
+  PIGLIT_NO_WINDOW = "1"
+  PIGLIT_PLATFORM = "gbm"
+  WAFFLE_PLATFORM = "gbm"
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index 307ca7a7465..ff68829f20b 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -221,9 +221,8 @@ zink-tu-a618-traces-performance:
     - .test-radv
     - .b2c-test-gl
   variables:
-    PIGLIT_PROFILES: all
-    PIGLIT_PLATFORM: gbm
-    HWCI_TEST_SCRIPT: ./install/valve/gl_combined_testing.sh
+    DEQP_SUITE: zink-radv
+    HWCI_TEST_SCRIPT: ./install/deqp-runner.sh
     B2C_JOB_SUCCESS_REGEX: 'Execution is over, pipeline status: 0'
     B2C_TIMEOUT_OVERALL_MINUTES: 20