From patchwork Tue Jan 24 18:00:58 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: 646027 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp338143pvb; Tue, 24 Jan 2023 10:02:50 -0800 (PST) X-Google-Smtp-Source: AMrXdXsk/6eLhV2fEZKdg2kDYXZIVyQYj86WnPlihZcRkcdZtmen2DjoinrICAoYmvLx21Eac/Og X-Received: by 2002:a05:6512:1042:b0:4a4:68b9:6085 with SMTP id c2-20020a056512104200b004a468b96085mr10781992lfb.16.1674583370075; Tue, 24 Jan 2023 10:02:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674583370; cv=none; d=google.com; s=arc-20160816; b=0f1XV7K3dB11MhQqqd2r7x2fTPWQGen2jDoyyy5jSNGOOLvmw6BzWzRkQHsDp1G0uc 7AjP0ik4DazrFLtqIquliHKG4azWBwXQgxyNRjyTW/VIx+HUesFC6plwxK6KPJeCvWg4 PEA8xvv975xSilGGmY97+UzGmSJIAx86wQscLwjqhl6UTxAfNjk2K4a4tsnZgh451uJF XjMwB6u4z3DEyVdY9U/3/AzbohC8sGTh9VXau6Bjm8EPV+zyuyWrSEmUisjEqyFCt7ZJ MA76aj1za+D8cFcVNKBWcVBVqq30YjOcAtGHqNdt6rJ5RHfMf+o7qCXCTwzfkH/qkcTV +Glg== 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=oRU3Ah95SUqUsxi4cqMn3+PmSbRjKec9E/zr7EwVQEo=; b=gcIozoiqd76rsPFe50OUI0tC5YcTc6cGpEQDUMRG3+fXpFpQL0aTVZKFWHYVHxU4mx MZAAMtEPEPb5DKrQwm5yTqe7cy0Xsd4v8GOMH7UfX58pHgL6mndmKehuvKZiiFaTw8Oh Q7+SYBBTGij1bUVAmZaBMxDMFmVnVG67IuI07WsSnE1rZ82IULxsUAvGchNmQOabPHVe qJbHrCK6iluCYgkt8pJ37P+M0WwnFVzv3Z4lr6H5hA4MdOh1OPks01m3BPuzm7J+JO0w IvsU6YDcR08CxPD8olODGEcRbnC7jQZJW7MZii56l/LbZqyPBOAKLt4jXjHsS6gJd/GQ qfKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="AZBE0Z/C"; 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 n18-20020a195512000000b004cafb366030si1268938lfe.219.2023.01.24.10.02.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Jan 2023 10:02:50 -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="AZBE0Z/C"; 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 1pKNc9-0001VX-Vi; Tue, 24 Jan 2023 13:01:46 -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 1pKNc2-0001TW-Vq for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:01:39 -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 1pKNbx-00064l-Nv for qemu-devel@nongnu.org; Tue, 24 Jan 2023 13:01:38 -0500 Received: by mail-wm1-x32e.google.com with SMTP id iv8-20020a05600c548800b003db04a0a46bso1487478wmb.0 for ; Tue, 24 Jan 2023 10:01:32 -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=oRU3Ah95SUqUsxi4cqMn3+PmSbRjKec9E/zr7EwVQEo=; b=AZBE0Z/CjtHQ4YT7eBqFgmPoNRFpHXRKcW/UKHojEaXOEGIpYoVdyn9BrDWDjkKsTn ry/sxH3+5B1vGhI9V8dLWJtweJFqHVlXY46iLuhJCDq9mPu8fPoNKSzes7kUiX0lSMYl jgkq7KarEcpTx/TvP1V/C4qjWDRvsnyv41GxorhHNLzB6bFjhv/25mrkPvaBDHeB1YPB 84VB6pcGUgGSs9dPgOPaEkym6Cpl1kLs2WP3L7OTBWQVWHCanWOocplBuVW7BXIW61WH uLFDcMRZWf1S1KsTc2GWSMb3hl0PBx0f8Y1+xO3s8d/FA4DWZj3TGaGp1Z8sIhIQbfJ0 hMEw== 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=oRU3Ah95SUqUsxi4cqMn3+PmSbRjKec9E/zr7EwVQEo=; b=gnw2K/qd/cWgDVdyNW3qbDYVZ7G/HJCMKEA8Afvlt5AORVELie1LlDlyhS0IkgtNYw XcQZauFmVzLbl/e2PgR9ma5Dyf6SDOYaIIm9vD+fXkHE+LCm72B61KwDkN7gJywpEVcr MpKhTVnTdBtE3gwfMNBGJkxxlrZ64k211bUBPbo5j0hmtp/caEcCJlolVnpTCccBY6aB vml4ei0ovLG0oEFd0/tHy0kkt9G7LWsp7GZ66SouHM+0kk/n+1BQ9Bo2MOTk0fR9POp4 i+3aZpncgiwps6rqVMLl3OUcRHYHTZJ0BNIyHLl+eNz7W0Ht/eXKKKbHjTyKelZKLlYU 7Cgw== X-Gm-Message-State: AFqh2kp5f0eDtNl5KiGq5HkeN5Saf3k9s6TQw9TadDGulsiKKRKvIMPe GWSO/GB3YZ3QzaengRtE+fDtAA== X-Received: by 2002:a1c:4c0a:0:b0:3db:210:6a24 with SMTP id z10-20020a1c4c0a000000b003db02106a24mr27476797wmf.8.1674583290918; Tue, 24 Jan 2023 10:01:30 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v19-20020a05600c429300b003db03725e86sm2566214wmc.8.2023.01.24.10.01.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 10:01:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3AD2F1FFBE; Tue, 24 Jan 2023 18:01:28 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Ed Maste , Thomas Huth , Alexandre Iooss , Markus Armbruster , Jagannathan Raman , John G Johnson , Mahmoud Mandour , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , Bandan Das , Elena Ufimtseva , Michael Roth , Eduardo Habkost , Beraldo Leal , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Qiuhao Li , Stefan Hajnoczi , Alexander Bulekov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Paolo Bonzini , Darren Kenny , qemu-arm@nongnu.org, Yanan Wang , Cleber Rosa , Wainer dos Santos Moschetta , Marcel Apfelbaum , Li-Wen Hsu , Peter Maydell Subject: [PATCH v2 06/35] .gitlab-ci.d/windows: do not disable opengl Date: Tue, 24 Jan 2023 18:00:58 +0000 Message-Id: <20230124180127.1881110-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230124180127.1881110-1-alex.bennee@linaro.org> References: <20230124180127.1881110-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 --- .gitlab-ci.d/windows.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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; }'