diff options
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 21 |
1 files changed, 14 insertions, 7 deletions
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 |