From 16b999b7d156b1f8b8bb03ea2fb140c65be6475b Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 19 Nov 2019 08:39:00 +0100
Subject: [PATCH] gitlab-ci: allow to run dEQP Vulkan with DEQP_VER
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
---
 .gitlab-ci.yml            | 15 +++++++++++++--
 .gitlab-ci/deqp-runner.sh | 21 ++++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 581fb8c2ed2..22492727872 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -545,13 +545,24 @@ piglit-quick_shader:
       -x spec@glsl-1.50@execution@built-in-functions
     PIGLIT_PROFILES: quick_shader
 
-.deqp-test-gl:
-  extends: .test-gl
+.deqp-test:
   variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     - ./artifacts/deqp-runner.sh
 
+.deqp-test-gl:
+  extends:
+    - .test-gl
+    - .deqp-test
+
+.deqp-test-vk:
+  extends:
+    - .test-vk
+    - .deqp-test
+  variables:
+    DEQP_VER: vk
+
 test-llvmpipe-gles2:
   variables:
     DEQP_VER: gles2
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index b8b63b88161..c9231c7c54b 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -15,7 +15,7 @@ DEQP_OPTIONS+=(--deqp-visibility=hidden)
 #DEQP_OPTIONS+=(--deqp-watchdog=enable)
 
 if [ -z "$DEQP_VER" ]; then
-   echo 'DEQP_VER must be set to something like "gles2" or "gles31" for the test run'
+   echo 'DEQP_VER must be set to something like "gles2", "gles31" or "vk" for the test run'
    exit 1
 fi
 
@@ -37,8 +37,14 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
 RESULTS=`pwd`/results
 mkdir -p $RESULTS
 
-# Generate test case list file
-cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt
+# Generate test case list file.
+if [ "$DEQP_VER" == "vk" ]; then
+   cp /deqp/mustpass/vk-master.txt /tmp/case-list.txt
+   DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk
+else
+   cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt
+   DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER
+fi
 
 # If the job is parallel, take the corresponding fraction of the caselist.
 # Note: N~M is a gnu sed extension to match every nth line (first line is #1).
@@ -58,10 +64,11 @@ fi
 set +e
 
 run_cts() {
-    caselist=$1
-    output=$2
+    deqp=$1
+    caselist=$2
+    output=$3
     deqp-runner \
-        --deqp /deqp/modules/$DEQP_VER/deqp-$DEQP_VER \
+        --deqp $deqp \
         --output $output \
         --caselist $caselist \
         --exclude-list $ARTIFACTS/$DEQP_SKIPS \
@@ -168,7 +175,7 @@ quiet() {
     set -x
 }
 
-run_cts /tmp/case-list.txt $RESULTS/cts-runner-results.txt
+run_cts $DEQP /tmp/case-list.txt $RESULTS/cts-runner-results.txt
 DEQP_EXITCODE=$?
 
 quiet generate_junit $RESULTS/cts-runner-results.txt > $RESULTS/results.xml
-- 
2.30.2