From ad2995d1e1db41187b3bf5c1b067a3f04e26590c Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Thu, 22 Jul 2021 10:40:36 -0700 Subject: [PATCH] ci/i915g: Merge the two dEQP runs together. Fewer buttons for me to have to click for manual MR testing. Acked-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- src/gallium/drivers/i915/ci/deqp-i915g.toml | 21 +++++++++++++++++++++ src/gallium/drivers/i915/ci/gitlab-ci.yml | 8 +------- 2 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 src/gallium/drivers/i915/ci/deqp-i915g.toml diff --git a/src/gallium/drivers/i915/ci/deqp-i915g.toml b/src/gallium/drivers/i915/ci/deqp-i915g.toml new file mode 100644 index 00000000000..5dee0a0a592 --- /dev/null +++ b/src/gallium/drivers/i915/ci/deqp-i915g.toml @@ -0,0 +1,21 @@ +[[deqp]] +deqp = "/deqp/modules/gles2/deqp-gles2" +caselists = ["/deqp/mustpass/gles2-master.txt"] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] + +[[deqp]] +deqp = "/deqp/external/openglcts/modules/glcts" +caselists = ["/deqp/mustpass/gles2-khr-master.txt"] +deqp_args = [ + "--deqp-surface-width=256", + "--deqp-surface-height=256", + "--deqp-surface-type=pbuffer", + "--deqp-gl-config-name=rgba8888d24s8ms0", + "--deqp-visibility=hidden" +] diff --git a/src/gallium/drivers/i915/ci/gitlab-ci.yml b/src/gallium/drivers/i915/ci/gitlab-ci.yml index 8b89b93ac52..b6f7f9a6a6e 100644 --- a/src/gallium/drivers/i915/ci/gitlab-ci.yml +++ b/src/gallium/drivers/i915/ci/gitlab-ci.yml @@ -16,13 +16,7 @@ i915-g33-deqp: - .deqp-test variables: DEQP_VER: gles2 - -i915-g33-khr-deqp: - extends: - - .anholt-g33-test - - .deqp-test - variables: - DEQP_VER: gles2-khr + DEQP_SUITE: i915g i915-g33-piglit: extends: