From 4e581b02020fce6867e47bed215a52f589d57bb0 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Sat, 12 Jun 2021 13:55:26 +0100
Subject: [PATCH] ci/lava: Set PIGLIT_NO_WINDOW

This got lost in the move away from hardcoded environment variables, and
fixes the Iris EGL tests.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Acked-by: Martin Peres <martin.peres@mupuf.org>
Acked-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11337>
---
 .gitlab-ci/common/generate-env.sh         | 1 +
 .gitlab-ci/lava/lava-gitlab-ci.yml        | 1 +
 src/gallium/drivers/iris/ci/gitlab-ci.yml | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 0905d433f36..602f6bbca5b 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -59,6 +59,7 @@ for var in \
     PAN_MESA_DEBUG \
     PIGLIT_FRACTION \
     PIGLIT_JUNIT_RESULTS \
+    PIGLIT_NO_WINDOW \
     PIGLIT_OPTIONS \
     PIGLIT_PLATFORM \
     PIGLIT_PROFILES \
diff --git a/.gitlab-ci/lava/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
index 5f7a7767619..93bd5935372 100755
--- a/.gitlab-ci/lava/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -18,6 +18,7 @@
     MESA_BUILD_PATH: "${PIPELINE_ARTIFACTS_BASE}/mesa-${ARCH}.tar.gz"
     JOB_ROOTFS_OVERLAY_PATH: "${JOB_ARTIFACTS_BASE}/job-rootfs-overlay.tar.gz"
     JOB_RESULTS_PATH: "${JOB_ARTIFACTS_BASE}/results.tar.gz"
+    PIGLIT_NO_WINDOW: 1
   script:
     - ./artifacts/lava/lava-submit.sh
   artifacts:
diff --git a/src/gallium/drivers/iris/ci/gitlab-ci.yml b/src/gallium/drivers/iris/ci/gitlab-ci.yml
index 62710261fcb..806d1a558ad 100644
--- a/src/gallium/drivers/iris/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/iris/ci/gitlab-ci.yml
@@ -84,6 +84,7 @@ iris-apl-egl:
   extends:
     - .iris-apl-test
   variables:
+    PIGLIT_NO_WINDOW: 0
     DEQP_VER: egl
 
 iris-glk-gles2:
@@ -121,6 +122,7 @@ iris-glk-egl:
   extends:
     - .iris-glk-test
   variables:
+    PIGLIT_NO_WINDOW: 0
     DEQP_VER: egl
 
 iris-amly-gles2:
@@ -157,6 +159,7 @@ iris-amly-egl:
   extends:
     - .iris-amly-test
   variables:
+    PIGLIT_NO_WINDOW: 0
     DEQP_VER: egl
 
 iris-amly-piglit:
@@ -165,6 +168,7 @@ iris-amly-piglit:
     - .lava-piglit
   parallel: 3
   variables:
+    PIGLIT_NO_WINDOW: 0
     PIGLIT_PLATFORM: mixed_glx_egl
     PIGLIT_PROFILES: gpu
     PIGLIT_JUNIT_RESULTS: 1