From patchwork Fri Nov 25 11:40:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055797 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 10AB4C4332F for ; Fri, 25 Nov 2022 11:41:57 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyX4x-0000NV-T8; Fri, 25 Nov 2022 06:41:11 -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 1oyX4v-0000NM-Ui for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:09 -0500 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyX4u-000774-8s for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:09 -0500 Received: by mail-pj1-x1030.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so2758213pjo.3 for ; Fri, 25 Nov 2022 03:41:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=6D5WXm3U8AFefut/ddoBCFTmXCdpyUuRqoPeLaxrZ58=; b=qZlnKqhBKgbxJmXnwfD5mcFSaGP3CIUEfXoKfe7Z2HSjxB7n3w6IN/8aY7k+e0poyk VGHkptml9myb2p0nDOqXk3mLn8yi8AYrYmY9VXceukD4fjEnqdh4LiEgTAoQXAvy5zME Z8q5CsruDByA+gfUHfd7FSXxQzerhoWrjPfCKNeqTJQqvGu7vqeuAn2r3dA+rV5EewK5 4MWS6YYGrqDlfOWAwowQlN7c++ps0DWKuqUpEODi+hhi/C1yHn87FpyMZEaYPHGJDhtb Zt24MOzpfZoTJZG4dhUNN4E5bhkkFLbe/wzzwKzmc0DszEjpXNSE3HOUGzDwvUyycoEn xFNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6D5WXm3U8AFefut/ddoBCFTmXCdpyUuRqoPeLaxrZ58=; b=KUnp5lCt1YsWcYfibl/J7tvVJ5qmpd6Z+8CQKi1Kz56g0JcXImy5E+MXbfzo+NnZ99 6GTs5WI8r/1uEwhOoq2Jk8jtd2UmrVictOrxi8mydYxGs02cStWcD7l/FecuOZ2fV9X5 6F4cvG4uT2RDu+dGA46daXgUKNUDC0AeFNQN/eKTiOkzXSOA4VBjeQaB8cyqgQ6MpnHZ 4VUSfJAd+zJJlwZZZIQWG1bdTo87kd1oPR7RQfh0C4Lq7Kur5rrEDZeZzN1RNKyw8uUR 4/Ep6zVDMET2Q9gBqjOhRVsrPxpEyaekAqk8WW/WQShEvfmhe/A5dI/8b/PYFvtcd4KD tgtg== X-Gm-Message-State: ANoB5plofkXvAYZah/WpMYi783M6PmjrsPAOfHcPGJ+dy3Fj9LXSamnu mgIe0MjxQqvlJx+gPxaPPXkDLCnV4dY= X-Google-Smtp-Source: AA0mqf4BrytwRW0MUj5NmA3KTYehNPKTXM2NZKSQ+xNNMi2W11LTIqJILucIi2ZR9eS3xP2DzH6Qqg== X-Received: by 2002:a17:90b:f04:b0:218:8ec2:a4e2 with SMTP id br4-20020a17090b0f0400b002188ec2a4e2mr33047919pjb.174.1669376466298; Fri, 25 Nov 2022 03:41:06 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id h11-20020a62830b000000b0056c063dd4cfsm2917884pfe.66.2022.11.25.03.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:41:05 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , Bin Meng , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v2 1/4] .gitlab-ci.d/windows.yml: Unify the prerequisite packages Date: Fri, 25 Nov 2022 19:40:57 +0800 Message-Id: <20221125114100.3184790-1-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=bmeng.cn@gmail.com; helo=mail-pj1-x1030.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, FREEMAIL_FROM=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bin Meng At present the prerequisite packages for 64-bit and 32-bit builds are slightly different. Let's use the same packages for both for easier maintenance in the future. Signed-off-by: Bin Meng --- (no changes since v1) .gitlab-ci.d/windows.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index a3e7a37022..99d78c2213 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -41,11 +41,15 @@ msys2-64bit: mingw-w64-x86_64-gcc mingw-w64-x86_64-glib2 mingw-w64-x86_64-gnutls + mingw-w64-x86_64-gtk3 + mingw-w64-x86_64-libgcrypt + mingw-w64-x86_64-libjpeg-turbo mingw-w64-x86_64-libnfs mingw-w64-x86_64-libpng mingw-w64-x86_64-libssh mingw-w64-x86_64-libtasn1 mingw-w64-x86_64-libusb + mingw-w64-x86_64-lzo2 mingw-w64-x86_64-nettle mingw-w64-x86_64-ninja mingw-w64-x86_64-pixman @@ -79,16 +83,22 @@ msys2-32bit: mingw-w64-i686-gtk3 mingw-w64-i686-libgcrypt mingw-w64-i686-libjpeg-turbo + mingw-w64-i686-libnfs + mingw-w64-i686-libpng mingw-w64-i686-libssh mingw-w64-i686-libtasn1 mingw-w64-i686-libusb mingw-w64-i686-lzo2 + mingw-w64-i686-nettle mingw-w64-i686-ninja mingw-w64-i686-pixman mingw-w64-i686-pkgconf mingw-w64-i686-python + mingw-w64-i686-SDL2 + mingw-w64-i686-SDL2_image mingw-w64-i686-snappy - mingw-w64-i686-usbredir " + mingw-w64-i686-usbredir + mingw-w64-i686-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink From patchwork Fri Nov 25 11:40:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 01A3DC4167D for ; Fri, 25 Nov 2022 11:41:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyX4z-0000Nx-9b; Fri, 25 Nov 2022 06:41:13 -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 1oyX4y-0000Nl-Nz for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:12 -0500 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyX4w-000774-6m for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:12 -0500 Received: by mail-pj1-x1030.google.com with SMTP id 3-20020a17090a098300b00219041dcbe9so2758339pjo.3 for ; Fri, 25 Nov 2022 03:41:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=KDjVTAH8LlRrZ6tLROLGSUk6FaVM9Pw/d6Cvy7PvHO4=; b=WAS7UsDSdOORr5ZjmK8sEAPejxpKoDeTVIEirktZj7YCs+ES9C2Hv3hdMeSkFSPp1E 9gH74qoH4a8jsmE0OJPqtyjfXxtdYw8ZwHCpoK4IlWEgB9yqbsr9e8xmDGQE1nj7P6gv RfdDISJ+/XfIhoLZ8G/5YtmfF3Ass2GWCcyB34P36jEbmpVMLzNdZtvUom8gnqM0+neH 5iGUtDZeQgdIKGzYmOC83yDUmJX+o1wjyQH10BCiTSdBpeYNPtr/erh/Zwb235X1P91D TT9UGE2Ph12kpkzwlOyyM4WWV1E+wQiy4anZon6e/zoWf2IV0W2gE1MVPVKhk6NgmjMH ggJw== 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=KDjVTAH8LlRrZ6tLROLGSUk6FaVM9Pw/d6Cvy7PvHO4=; b=snysGgldGYvpHBXwFz8H6sGbAlQ6k73cRV+nhJQLq3M88glLn9KhpMEM6I6d0zdj+i +DDsfo7aQifstSRHTfS0yUSzyZwqz2O6+qTpTRTEF1goPLyO26Q3tOZWeumiipYC/2Ov JBZXrw2dalrqMhdbYwakjo0zZpTAz/Kr7fJhxkLoHIsU/RkCHLxjUrgDOdWLTiQZdFHk Ie6UuVs+MTYvaiu2hVAsw/Zd3GgcH5ZH/yRB2g5sr+SVQtXXVZJ5kU9vHmqV7cLPGbE8 W4nEkHcTpTIgShQmonDqTSeTrSA3JsWaU8hi106blLOIgoAH/NITNBjEW2wdH2s2nmgJ l30Q== X-Gm-Message-State: ANoB5pmBD8ozntlpK9A+s7U1zv4H0l2r32jyoktK7PYohTgE7WWGBtaX HLXHltqB5vbxezqxJsudkre7EsPt1s4= X-Google-Smtp-Source: AA0mqf7j8q4SBDRN8Kl59ppePawnekT0hTGmsltVhBMMfV7C2aXxVlHkH02Zv6wzaaiK/URwIsph1A== X-Received: by 2002:a17:90b:4f89:b0:218:d481:6b7a with SMTP id qe9-20020a17090b4f8900b00218d4816b7amr15991170pjb.4.1669376469339; Fri, 25 Nov 2022 03:41:09 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id h11-20020a62830b000000b0056c063dd4cfsm2917884pfe.66.2022.11.25.03.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:41:08 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , Bin Meng , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v2 2/4] .gitlab-ci.d/windows.yml: Keep 64-bit and 32-bit build scripts consistent Date: Fri, 25 Nov 2022 19:40:58 +0800 Message-Id: <20221125114100.3184790-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221125114100.3184790-1-bmeng.cn@gmail.com> References: <20221125114100.3184790-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1030; envelope-from=bmeng.cn@gmail.com; helo=mail-pj1-x1030.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, FREEMAIL_FROM=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bin Meng At present the build scripts of 32-bit and 64-bit are inconsistent. Let's keep them consistent for easier maintenance. While we are here, add some comments to explain that for the 64-bit job, "--without-default-devices" is a must have, at least for now. Signed-off-by: Bin Meng Reviewed-by: Thomas Huth --- Changes in v2: - remove "--enable-capstone" .gitlab-ci.d/windows.yml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 99d78c2213..6741c90ff1 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -61,12 +61,19 @@ msys2-64bit: mingw-w64-x86_64-usbredir mingw-w64-x86_64-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - - $env:MSYSTEM = 'MINGW64' # Start a 64 bit Mingw environment + - $env:MSYSTEM = 'MINGW64' # Start a 64-bit MinGW environment - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - - .\msys64\usr\bin\bash -lc './configure --target-list=x86_64-softmmu - --enable-capstone --without-default-devices' - - .\msys64\usr\bin\bash -lc 'make' - - .\msys64\usr\bin\bash -lc 'make check || { cat build/meson-logs/testlog.txt; exit 1; } ;' + - mkdir output + - cd output + # Note: do not remove "--without-default-devices"! + # commit 9f8e6cad65a6 ("gitlab-ci: Speed up the msys2-64bit job by using --without-default-devices" + # changed to compile QEMU with the --without-default-devices switch + # 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' + - ..\msys64\usr\bin\bash -lc 'make' + - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' msys2-32bit: extends: .shared_msys2_builder @@ -100,10 +107,10 @@ msys2-32bit: mingw-w64-i686-usbredir mingw-w64-i686-zstd " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinG environment + - $env:MSYSTEM = 'MINGW32' # Start a 32-bit MinGW environment - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - mkdir output - cd output - - ..\msys64\usr\bin\bash -lc "../configure --target-list=ppc64-softmmu" + - ..\msys64\usr\bin\bash -lc '../configure --target-list=ppc64-softmmu' - ..\msys64\usr\bin\bash -lc 'make' - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' From patchwork Fri Nov 25 11:40:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0CD52C46467 for ; Fri, 25 Nov 2022 11:41:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyX52-0000RH-V9; Fri, 25 Nov 2022 06:41:17 -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 1oyX51-0000PS-B6 for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:15 -0500 Received: from mail-pj1-x1029.google.com ([2607:f8b0:4864:20::1029]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyX4z-0007GZ-RK for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:15 -0500 Received: by mail-pj1-x1029.google.com with SMTP id b13-20020a17090a5a0d00b0021906102d05so2446556pjd.5 for ; Fri, 25 Nov 2022 03:41:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=ZDijJETnCufbJJRGG9gGP5GnFudVrYngYSIjOtUgPto=; b=Qes/NIYjFl37oQ4Z6446LSsb2ruR/SXOsHmnlMce1g2r8zpMDmgm73tuY5LbBi4Lvd CwvQPV/Yv/Zsjf0KR0jl8uYYQKRszHqwlUDkQbdtBGnh/celanTGUCxXb3weM9GOPTQQ 6UgmJFk4hrOAnwVzyXrh4rNxP2NhzEtYvOkL3jK88xsmI4H8GtXQFZccjXAww4VuSUDU GOZcmiJNHJtLLW0scB0jY2htPXCV40K3A33mGatEKqSkfb33HS5B+XbTPYRDwYf9BN9s jKpbgqL+roIt8LcM2lcfCq0CaFFNuNCD6OUvEmTHSRw6/JUnLW88WQ/a2WnFJD1XaTu7 Dm5A== 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=ZDijJETnCufbJJRGG9gGP5GnFudVrYngYSIjOtUgPto=; b=FA6CqMR60B5yYfgmYuW0FPwiywJUoSNFpIdR99inTglKQIL1WYkGNGkq0hCOPOSH7f O6AvxDjqv6iG/LZv5ROHYhwuT+UjSGoUqot7/eT0siRvSoW8Nu7r9qGA2nwq0dxktIRQ OkKmVXCp8WkObFLTIaSGwmRyPDjx9UpqWW9/erLhQvM/RVreDHPUzmyFgL3pFVbawONE N63HdH9aHTFa/R2ISAnI5kX0oObEggRcyuW5pesp+Fop8P8hVLFKzjQGvSCDPJKr7JwL aQuvBOeFmyuMgYaPEw+iRK1S6cUcv24j0f4r80gyaBQjHXoebis8AdoWThADVt6fOSDr 6MPg== X-Gm-Message-State: ANoB5pkXe4GpSUcNRMqvW61/BinnFQkqVilLRpRrVwlt5RB55PJiXbhh IdUai1O6Gho9jzoxlX9IOUE0Q+1VVjU= X-Google-Smtp-Source: AA0mqf4UynitlQvuDvE9zYOukj0Vuc2jNnRuwOxot8zKNwMc04J29cDkzkO+/xkcktH3SPRDj9IqLQ== X-Received: by 2002:a17:90a:a88e:b0:213:13ab:c309 with SMTP id h14-20020a17090aa88e00b0021313abc309mr39756840pjq.80.1669376472296; Fri, 25 Nov 2022 03:41:12 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id h11-20020a62830b000000b0056c063dd4cfsm2917884pfe.66.2022.11.25.03.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:41:11 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , Bin Meng , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta Subject: [PATCH v2 3/4] .gitlab-ci.d/windows.yml: Exclude qTests from 64-bit CI job for now Date: Fri, 25 Nov 2022 19:40:59 +0800 Message-Id: <20221125114100.3184790-3-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221125114100.3184790-1-bmeng.cn@gmail.com> References: <20221125114100.3184790-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1029; envelope-from=bmeng.cn@gmail.com; helo=mail-pj1-x1029.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, FREEMAIL_FROM=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bin Meng qTests don't run successfully with "--without-default-devices", so let's exclude the qtests from CI for now. Suggested-by: Marc-André Lureau Signed-off-by: Bin Meng Reviewed-by: Thomas Huth --- (no changes since v1) .gitlab-ci.d/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 6741c90ff1..9b5c4bcd8a 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -73,7 +73,9 @@ msys2-64bit: - ..\msys64\usr\bin\bash -lc '../configure --target-list=x86_64-softmmu --without-default-devices' - ..\msys64\usr\bin\bash -lc 'make' - - ..\msys64\usr\bin\bash -lc 'make check || { cat meson-logs/testlog.txt; exit 1; } ;' + # qTests don't run successfully with "--without-default-devices", + # so let's exclude the qtests from CI for now. + - ..\msys64\usr\bin\bash -lc 'make check MTESTARGS=\"--no-suite qtest\" || { cat meson-logs/testlog.txt; exit 1; } ;' msys2-32bit: extends: .shared_msys2_builder From patchwork Fri Nov 25 11:41:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EF314C4167B for ; Fri, 25 Nov 2022 11:41:58 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyX55-0000Rp-VV; Fri, 25 Nov 2022 06:41:19 -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 1oyX53-0000RP-Qt for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:18 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyX52-0007Rd-9M for qemu-devel@nongnu.org; Fri, 25 Nov 2022 06:41:17 -0500 Received: by mail-pl1-x62e.google.com with SMTP id p12so3777931plq.4 for ; Fri, 25 Nov 2022 03:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=8W2UWjR5eVUYZK+3egBJhjvSiwbID9YJabXGeDtGMcs=; b=SAz6/qdsDOzZeVYR9KGZDobgE5BQId5c3WCIoGlgwyWX/pGwlKUHm6cwR3OPhvYxRt YpbODLAkNDW+eBDPCfnomt+UKmNkc+xXVr1fCAnJKNC4JHiLjVMCjdCpUmFQ55hop8iz khh+X8qo+einoujBI1VzMxiqPFb8uKGHlIoDWkhavR3XHsAPpEFxOr/Abu1AAFf4CY3K pbRCaudsPO8hEiSo2IqhfcQ0KYWVwDlJIkLy6UQoXYcizzrStWA6sWpmla3Q76e96R4l Bd2C3GTuqPE5laHwkv3BoicfiS7O3D9AIPNeYIGOWiq26PLA9/8OWWC/69s/PlRgwfuY 7V/A== 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=8W2UWjR5eVUYZK+3egBJhjvSiwbID9YJabXGeDtGMcs=; b=u3mY0a2CuLbuodKBGpitgrYxy3/szEOx/nPfWM90BhkUvirzgzj6WKR7p7iPdREBA2 /r4sBjnU6CBsZySZS14d1YeaMdigE1rYaARILNJYR9lFKhedgyq1az6T9+miQT/WQV2J onqkw+XZshr+h6vsynseuay7ZVvpds8Fohu6RGTqnNC2WmYn+SqWIUQ+mS6QZlh1nlDr WZ/AbYHe0PbDnDOyJdUmvi2stWTaxYMNQkKgfDBoLfCATWULUXfExnMlVhYeo3pvo6+w AnUWKKDpmoqpDYydrXX4D6Eu9xES6tysHQ7q+77YU7SKMbsyVobWHNjt4UMGZBdNCB1j CFpw== X-Gm-Message-State: ANoB5pnzXYH61Pme1+ReK8fvJULkgslURCk9hyiQIw3AcD4eaTU7saHU b4WfWth2RoKC5EkzDkbXqnvjHb/tLdc= X-Google-Smtp-Source: AA0mqf4xXMWYndHVusBoQMq3cs2y0yPWREG9C13IfW1B+S7SovFBQYWq7BVESfauUFqYd9sYLf0JBQ== X-Received: by 2002:a17:90b:2801:b0:200:2069:7702 with SMTP id qb1-20020a17090b280100b0020020697702mr40773190pjb.239.1669376474825; Fri, 25 Nov 2022 03:41:14 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id h11-20020a62830b000000b0056c063dd4cfsm2917884pfe.66.2022.11.25.03.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 03:41:14 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Thomas Huth , Bin Meng , Laurent Vivier , Paolo Bonzini Subject: [PATCH v2 4/4] tests/qtest: Enable qtest build on Windows Date: Fri, 25 Nov 2022 19:41:00 +0800 Message-Id: <20221125114100.3184790-4-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221125114100.3184790-1-bmeng.cn@gmail.com> References: <20221125114100.3184790-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=bmeng.cn@gmail.com; helo=mail-pl1-x62e.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, FREEMAIL_FROM=0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Bin Meng Now that we have fixed various test case issues as seen when running on Windows, let's enable the qtest build on Windows. Signed-off-by: Bin Meng Reviewed-by: Thomas Huth --- (no changes since v1) tests/qtest/meson.build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index c07a5b1a5f..f0ebb5fac6 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -1,9 +1,3 @@ -# All QTests for now are POSIX-only, but the dependencies are -# really in libqtest, not in the testcases themselves. -if not config_host.has_key('CONFIG_POSIX') - subdir_done() -endif - slow_qtests = { 'ahci-test' : 60, 'bios-tables-test' : 120,