From patchwork Tue Jan 10 17:39:02 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: 1724309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=jPPNsLbn; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Ns17X5Sy6z23g2 for ; Wed, 11 Jan 2023 06:28:23 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFIb3-0003Sg-N7; Tue, 10 Jan 2023 12:39:37 -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 1pFIb0-0003Or-VR for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pFIax-0001Es-RM for qemu-devel@nongnu.org; Tue, 10 Jan 2023 12:39:34 -0500 Received: by mail-wm1-x335.google.com with SMTP id p3-20020a05600c1d8300b003d9ee5f125bso6022111wms.4 for ; Tue, 10 Jan 2023 09:39:31 -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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=jPPNsLbnnIxo/pXYTxvlQi3DAmoNmimjvXG/YU0TkjjsLv9DOqtRHcxSwCOwBCL6Mt E5H9kxSDQj7DnJXs+IORZgO5gNDBnWIY4VyhsFfHgTnQnqMoB6IM+1MH7vQcR0btoraX a8VNOpW7GwrX6Oy5BycpLwb9xUIOYTbww+/m8KlO+IDjv3fouOb67VFF9sL2XdQp/OgM OCkCEtAATrpH0kKfPqCNwXpBsCmoUKkHsUmaVQEk1KTrpVgCCd/BLr0SLyFM9qLuwpeY gfdJzXLHX0HjjACff3K/XJ65SIFEYAfsYMOx82Tnndu36WIJgpHARWJ7ikZNLxcZuan+ uyzw== 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=6fZnQvIJIidUw8gfSAFc62jHoyrBtFd/nsmfx/H20uY=; b=lJ3gxmGKr0isaumdY/IC0LYdjF71/AvJD+1aEeelIWw+LSdvYoadGc/5/XvRzd4xYO rQ8wADtm7etTqb0Dk1hqsjbrlkLBpnpoT5EbehdntXCD5LPd8bsGOkDxWk45TRbISkAK 4tilZnplupUzpFLa3e/RpvK7GGSnjutMWH5GFmRZdGe+OaREyJ6ZP/h+olsBXSSEN20S Dh42sScI8/VfEK461B/trOiZfB5u4CV5B8cpt5yP59hBKHLbsdV/ceI7z3GLmQOtexnA uaXXBS7x46OaTkqXYIxyO+6iXFghoftgEqg2NtwS85dAEFSJ7RoAyqDh/R9Kx4nzONrr 21SQ== X-Gm-Message-State: AFqh2kqspMCEgO+7zRd4JWrfupKKuirfuJNH26M5UuvGD3e/HVxr+SQi cAy0DpDh3KEKwQ0S6jpmTFhwMQ== X-Google-Smtp-Source: AMrXdXu3dEYCDcksr01RBt5/HYJHQwtzPKeusv4t7+EOyfeWTYcyafT2303gU9zrNInlus6O6hsfZw== X-Received: by 2002:a7b:c8ca:0:b0:3cf:728e:c224 with SMTP id f10-20020a7bc8ca000000b003cf728ec224mr50592798wml.6.1673372370441; Tue, 10 Jan 2023 09:39:30 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n7-20020a05600c4f8700b003c6bd12ac27sm18087617wmq.37.2023.01.10.09.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jan 2023 09:39:29 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 67E481FFBE; Tue, 10 Jan 2023 17:39:23 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Alexandre Iooss , Beraldo Leal , Thomas Huth , John Snow , Eduardo Habkost , Elena Ufimtseva , Ed Maste , Yanan Wang , Cleber Rosa , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Li-Wen Hsu , Markus Armbruster , Jagannathan Raman , =?utf-8?q?Daniel_P=2E_Berrang?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Michael Roth , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Marcel Apfelbaum , Peter Maydell , Paolo Bonzini , Mahmoud Mandour , John G Johnson Subject: [PATCH 06/26] .gitlab-ci.d/windows: do not disable opengl Date: Tue, 10 Jan 2023 17:39:02 +0000 Message-Id: <20230110173922.265055-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230110173922.265055-1-alex.bennee@linaro.org> References: <20230110173922.265055-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau The previous patch should fix shader compilation. Signed-off-by: Marc-André Lureau Reviewed-by: Thomas Huth Message-Id: <20230110132700.833690-3-marcandre.lureau@redhat.com> 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; }'