From patchwork Thu Jan 26 11:22:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 647088 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp185453pvb; Thu, 26 Jan 2023 03:23:17 -0800 (PST) X-Google-Smtp-Source: AK7set/MgO1Lbmz1aMhcJuV0LqeJS0leGbArFqSFQg0x0WGv76zcxn7dW9GJ3GhegOuXsuNEnSEl X-Received: by 2002:ad4:5a05:0:b0:537:e563:c33 with SMTP id ei5-20020ad45a05000000b00537e5630c33mr645474qvb.14.1674732197319; Thu, 26 Jan 2023 03:23:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674732197; cv=none; d=google.com; s=arc-20160816; b=q7QmvoW3gHyU5gJfp3J+BAotniv00gA0E86CyXtDq7Vk+UO9MKVPMgxFj2p0X8k52S eE1+IWTr6CDKaBhEGygNlEdyZNbwNSt5E8zoPh2mzqaOgjbIgK3kD7LQogyKPj1ZKjn9 qgpbVMTuqwDTYrSTbPB+KXAmwFZ/WfFKttZyK+wh9WA7fj1qNs3ApCyQ59NYqL1XKhXI /nRyX4MmwMLZp+xHpn3YdjmwGW7ktxNootuZ7qtucF68ZvxmkrCV1jRDtE/u8TfMgngX K/WGq8EGi9QidAVUqzOYHkG7eirXdMKOoXWb1Fppt+myQhb3Sqz1GLv7QjtUtRH2V9SW n81w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qzqwfdK21RM5z6fK6OdNzPsFVArHMF3Y75c3I4gjb7Q=; b=cCmphpQmpnvaWXzTDR5BPrz4R43o4gdVMOXy/8PE0dVhxLef8E0WclbpNZtk4k3rOR dQx4d0HRVzMAeIjPT2/DfAS0+Qaw1pvKr9Qj7fWZi4cWMTvOG+Z8iW1R1OlywiJ2Y8aY cbQEuAg00yZJhfGypCJxe/CYBTiFn72vBJtTywD2erPKJ67ogoekIQPpupJmr1YFRBcq c5sWouvsLcWu7FEz2RZs8XJjpWXAscDTK3va/fwwZMTW5YAem7PdufP4QRkc9+phWloi 1ft/z+vw4dfAjGE0LhVQRUVTbuyEQJhuIFMZueouLUFavPG/4xtHu2ImupxYucazPijR hwDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f9HICVH6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i12-20020ad4538c000000b005374ac6de0esi589677qvv.231.2023.01.26.03.23.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jan 2023 03:23:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=f9HICVH6; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL0LU-0002t0-KK; Thu, 26 Jan 2023 06:23:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pL0LL-0001tt-Df for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:59 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pL0LI-0003jP-Vk for qemu-devel@nongnu.org; Thu, 26 Jan 2023 06:22:58 -0500 Received: by mail-wm1-x32e.google.com with SMTP id q8so893874wmo.5 for ; Thu, 26 Jan 2023 03:22:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qzqwfdK21RM5z6fK6OdNzPsFVArHMF3Y75c3I4gjb7Q=; b=f9HICVH6R4imhHw4uEMQuLF8xLhU5452Ky/vfAECiau/TLCF349I7bmBOjDyyB8shy jtCAVH7NxmVPmMBMgUmENckVsFMAdLIZR7EvBaYTWHJhIRqV9a08pLjWeNsNr6aufyv5 GwPTOG9ejN0iTrB+LV9W571yY2rAWqVU8MJ1m+PmqZudf5xiaUSE4PvZPsxL0g1c5u4y I8igsFj+mJES+knBoD3X1HoRRm8EpxptTjrNX/t6V3haETSxvUJnSCzF+yAJOZwDoZmX Az36MbvXR3ptDh3fdp+xy8u69eeAEeg3HC8TI0Zh06CDNqDqZpdN3iLZLMhIbabnwnRC w9Ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qzqwfdK21RM5z6fK6OdNzPsFVArHMF3Y75c3I4gjb7Q=; b=MhaqMzGPyONLTiuomqTseN60Fa+63PigafuEXuMZdNMs/7zRuVanZx9x12ZGia7vaj W1cexR33rUJjNc5Q52cxjN4yzo8o4DlHrjoT9HdgRQWcb7XGPCI/D8sFsNn8PniJNE4Y Zfa9v4jckoKt0cKnTh3KEXvdCA9YeB63PEcwvVnQoglyJxloILMRd11EdXfCsUqrP8yh a1S1Wlr/zpMutMNr4NLB0FhR+9HfUD4hBm07SI8A7m3FGJWdGnvzQCEi5hRjrOpWCYXa +hK8uTEH57LbF9loaliBna0KJSbjIpWy1TIPyvqBUMgYUnS4pABEEYZ9tGBKi4cJwOcn ck3g== X-Gm-Message-State: AFqh2ko04c7H/JqYslslBxlwTYyxex8Cisw+7xniZR9yABdCqDEWz8Z1 XDFmisiYBJYxYo/MHolNkzaOBw== X-Received: by 2002:a05:600c:4928:b0:3d2:2043:9cb7 with SMTP id f40-20020a05600c492800b003d220439cb7mr35276437wmp.5.1674732175297; Thu, 26 Jan 2023 03:22:55 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x10-20020a05600c420a00b003c6b70a4d69sm1133311wmh.42.2023.01.26.03.22.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 03:22:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4D2511FFBD; Thu, 26 Jan 2023 11:22:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 06/35] .gitlab-ci.d/windows: do not disable opengl Date: Thu, 26 Jan 2023 11:22:21 +0000 Message-Id: <20230126112250.2584701-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230126112250.2584701-1-alex.bennee@linaro.org> References: <20230126112250.2584701-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Marc-André Lureau The previous patch should have fixed shader compilation. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230110132700.833690-3-marcandre.lureau@redhat.com> [AJB: tweak commit message] Signed-off-by: Alex Bennée Message-Id: <20230124180127.1881110-7-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index a1d5790580..cf445b77f6 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -71,7 +71,7 @@ msys2-64bit: # for the msys2 64-bit job, due to the build could not complete within # the project timeout. - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu - --without-default-devices --disable-opengl' + --without-default-devices' - ..\msys64\usr\bin\bash -lc 'make' # qTests don't run successfully with "--without-default-devices", # so let's exclude the qtests from CI for now. @@ -113,8 +113,7 @@ msys2-32bit: - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu - --disable-opengl' + - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu' - ..\msys64\usr\bin\bash -lc 'make' - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=\"--no-suite qtest\" || { cat meson-logs/testlog.txt; exit 1; }'