ci/zink: fixup the zink-lvp job
authorDavid Heidelberg <david.heidelberg@collabora.com>
Wed, 8 Mar 2023 19:23:22 +0000 (20:23 +0100)
committerMarge Bot <emma+marge@anholt.net>
Thu, 9 Mar 2023 06:27:39 +0000 (06:27 +0000)
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/8501
Fixes: 4cc0cec47357 ("ci: implement unified sections")

Reviewed-by: Emma Anholt <emma@anholt.net>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21796>

src/gallium/drivers/zink/ci/gitlab-ci.yml

index 5a6edfc..0bb0529 100644 (file)
@@ -43,8 +43,7 @@ zink-lvp:
     VK_LAYER_SETTINGS_PATH: ${CI_PROJECT_DIR}/install/zink-lvp-validation-settings.txt
     XVFB_SCRIPT: "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/deqp-runner.sh"
   script: |
-    . "$SCRIPTS_DIR"/setup-test-env.sh
-    xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh ${XVFB_SCRIPT}"
+    xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}"
 
 .zink-anv-test:
   extends: