From patchwork Fri Nov 25 10:49:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055748 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 B6809C4332F for ; Fri, 25 Nov 2022 10:50:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyWHR-0004wu-Kf; Fri, 25 Nov 2022 05:50:01 -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 1oyWHQ-0004wl-Dj for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:00 -0500 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyWHO-0004Mr-W3 for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:00 -0500 Received: by mail-pf1-x42c.google.com with SMTP id l7so1349653pfl.7 for ; Fri, 25 Nov 2022 02:49:58 -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=xDX+aKA/RS4d4hOmrGI6f2aGb1XqZKokkZqb6tEAlUU=; b=QigqTk8xDuT9GvX/g13Q7/S1F10qL4s0IYkEjJmd4uWUwoulGJmF8OimYUA3P2xGy3 c+vNA45cLIno95wZ2monENA75n8+cjyq3nviBvotAeJhQ2YFzR8Vq2eKOFwKIo7BIOth i0gFKKnFEubhvVFoZZX7uS9DMziM+AYxoTr+VxAiqTVomH1vImrr6s6whBBTaaJ5/TW4 ubqTiO9EEiWX9X/TbpRqegTolb3kkUmX5vOP6OCcYNCdW3jYxOre8KEg6WU5pRg+qaBU mkEZYvto0JLJinK9zVfWKrPgye0RyPHC1z9EU8rbtD8wBP9X/FIFtruq9rXdiMxEF+36 Oszg== 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=xDX+aKA/RS4d4hOmrGI6f2aGb1XqZKokkZqb6tEAlUU=; b=TnFFVVn1rwyxYZ4ul8YI0emW9Vy8+PF8eTNEkxN/UMcNFhAytGd2j7DrKH1iDg8Xhd ICWg4J5dNfXarGoEGtGLeBrjX1fjiCYxfqLPYMGztyEPTaG7RuJNs3MvMjUC69Tl25jX 4O07WsifNnQBxz4N7KVvMWSEaT+8RrLexeXtyJGTKFszmG/32pu3NymwaZ5s72658Pid Gb/WlEV+vkaq/Qd0eKwJ6vnmJjqA0RxNWc2g2PVcyZxsH1NiTLFZJHSDNefnJTor+kip ZP/oDpG4ckV+lEXg1yt30jJEpAsEwwEjVYUNPOeOu/WZvOtwkvaUPWcgdBJ4o+rxvuJm VP4g== X-Gm-Message-State: ANoB5pnb3N9nUDNp5q0nluZrGpcsdhlV9bs7/KwF/kZJdCeLdm6Fucmg pEvuticEuKmP6gCK1ZGKgqtBBCaoFcY= X-Google-Smtp-Source: AA0mqf45ZYoXbCgeUyfP/XKjHPczxlTCKJLMXJrPz7mU40ANUEerD2UF3tfYRAYQU2lNXp93bhJvsQ== X-Received: by 2002:a63:4703:0:b0:470:27c:54b8 with SMTP id u3-20020a634703000000b00470027c54b8mr15596211pga.578.1669373397180; Fri, 25 Nov 2022 02:49:57 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id j7-20020a170902da8700b00188f7ad561asm3055966plx.249.2022.11.25.02.49.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 02:49:56 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , 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 1/4] .gitlab-ci.d/windows.yml: Unify the prerequisite packages Date: Fri, 25 Nov 2022 18:49:48 +0800 Message-Id: <20221125104951.3169611-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::42c; envelope-from=bmeng.cn@gmail.com; helo=mail-pf1-x42c.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 --- .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 10:49:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055747 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 CA1BDC4167B for ; Fri, 25 Nov 2022 10:50:56 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyWHX-0004xk-BH; Fri, 25 Nov 2022 05:50:07 -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 1oyWHT-0004xV-JF for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:05 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyWHR-0004N3-Qa for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:03 -0500 Received: by mail-pj1-x1031.google.com with SMTP id k2-20020a17090a4c8200b002187cce2f92so7373509pjh.2 for ; Fri, 25 Nov 2022 02:50:01 -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=OjNuEto+tnE18PPcNQPWC8m9fl8QijoQZONWq7QG7BQ=; b=Y21wD0hepRivJWIenJL09W2/LO28VzUoA1k1ZpkCg1rZohaY1sZBZ6FwFCbhxqSkjf 2D5CIVAbAWsqe6gFtNq9Yu5Bdim/dW1hBYJqVSrHqOBF/9pcSRzzdUqOBsOIw12Vw6dL PBJwWx1sg/u/SktEe0akLEwmEJQpFTL+DfqP+SoEA29YJiC2l/p/WqR5UN00lSahks49 2QfjMP1f0W4IU5CRZPadgN7E9FoKBOpGq8O48uyduG8w7NA6w4cM95lPNiEAnnlrFwaf m1m3JBEGR+e6F9E1FwCYDpNHXORSzaNzXs/k1iyQo2oHN1+KL/CFv9ZXg3luLqMQHXTk AUDQ== 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=OjNuEto+tnE18PPcNQPWC8m9fl8QijoQZONWq7QG7BQ=; b=cPB+Lvrg4pzAPFavasBVKzVQ0i4bNWH+qUUKfKM1CMHaDSsJTWEK7GMUZmFE96oXPr /ZQAn6ocPhHuK5kP/d7ZYQW7mn7CNkXmhswPdMmY+pcVtRaOzGixQkRGDlWe5lMZg4Wl gB/beVIjck08TW+JhI4QT3iH6LxVtbwuTlDI7b/yj2bZQiQ0M2zNoBn4E/+bYSJ9AyHo nEOIMEtmCf6hVyJ6kVm5S81si17yyj3PNWuqr4jVyTLmjpRVIGPFSPjZuwKfWXYRsAoG HSCLu8/mvLY+tK9di8uEo/IBKoapimRQDmIH3+idltcmWpUByDHX2E/7k7yIMTEnaRFD TUfQ== X-Gm-Message-State: ANoB5pl7AE3op9TQTN43e6B/lqJTnICIN3TP3xkKugR0315vSkJAwzqb yArA2oOq7bikjoh8UjixxXz9D1ikyv4= X-Google-Smtp-Source: AA0mqf6isKzZQckfb9ECnwJbypmD7Sv173L4BoFVI0YSMXFdBvEkDrANXCJhVWOIhy9MchaA0ZddIA== X-Received: by 2002:a17:90a:ca13:b0:218:cf25:1e7a with SMTP id x19-20020a17090aca1300b00218cf251e7amr17541730pjt.29.1669373400081; Fri, 25 Nov 2022 02:50:00 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id j7-20020a170902da8700b00188f7ad561asm3055966plx.249.2022.11.25.02.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 02:49:59 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , 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 2/4] .gitlab-ci.d/windows.yml: Keep 64-bit and 32-bit build scripts consistent Date: Fri, 25 Nov 2022 18:49:49 +0800 Message-Id: <20221125104951.3169611-2-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221125104951.3169611-1-bmeng.cn@gmail.com> References: <20221125104951.3169611-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=bmeng.cn@gmail.com; helo=mail-pj1-x1031.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 --- .gitlab-ci.d/windows.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 99d78c2213..c6de65c784 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 + - 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 --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; } ;' + - ..\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,11 @@ 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 + --enable-capstone' - ..\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 10:49:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055750 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 A6851C4332F for ; Fri, 25 Nov 2022 10:51:10 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyWHZ-0004yM-SF; Fri, 25 Nov 2022 05:50:09 -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 1oyWHX-0004xm-AJ for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:07 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyWHU-0004PP-Ux for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:06 -0500 Received: by mail-pl1-x62a.google.com with SMTP id y4so3673969plb.2 for ; Fri, 25 Nov 2022 02:50:04 -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=ngKkBiobR4LuQBHuAmb4DYyLhbK+9nXlqAS9yJFgS4o=; b=mrOoDt1RpGlzpWbLqvqS35CMkVjWydL+dUfc0OjokBmyJIAOMPLHVTnn5rHFXn8ik8 WXj3GhCTDPSFASlIxNRfG1XDo4x2Tc73pFhf0/QavPiSnKDkKnlRyaFpWdfF+rFi3cqt BZSTcwt7DazI4ldkQ/YqctpDXn8Z3UYkUTftdP1GnF5V+hwNiDcPWy0FnHf6tmTlrWEb 8L6LBuIHGnCAZ81QGdkmhf3+cIiFsUUmySModPx1Y/4aDxqH+PCwuvFZZ8SZf3kwuH1A rHb2gn6080bZBwAtHxgVmFOIVOY9dngnGzAQ8g6g2X6Z6dt1iHeg04QbqkZzuNfr0cWj 4vCQ== 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=ngKkBiobR4LuQBHuAmb4DYyLhbK+9nXlqAS9yJFgS4o=; b=Ubt+dd2404OU9Wp6XjhuHsjnmWrfc+z8w2ve14zVPWxcIaJ/T4UHqOM1dqN2xlTdw9 YAZZWCD/KD9EExevio4gHSHAGKM8Cb4ei49RmOto6gko2lMSR6zl06e4s7fELQXrhPfg dLckPcfXCaVFIVFF2qeFXXBJUyJ9AS0kQxORtd4WB5ftLoFmyNnMCYMACwTaPjRXFAQ9 +axM/rbsZ50mR1Fq3zzbqZ1Z76TVfDhaBNOqj//XNmaSb0KP1CukIDEOF6XLkm/L4Ooe ofz09vSaZk/xn834lnRBFDor+De9bpXnsJxP3CWfFmLYjNjPLUtqCGpyF6Aok43JTaoT tSGQ== X-Gm-Message-State: ANoB5plqeqXvkDUDbAwVfOgDgLoBYk90K2Knwj1hnagqb2gt2FN+tOk6 n4aT+LRxrLTD7rnGpgTGEbRrvUrWp6k= X-Google-Smtp-Source: AA0mqf6ghYkElbAZ0tpN0mB5NKN0BVyWoQOXNn8zw9O2ggLT2WKDBL9lPIqPEdgyL/io0x0GB/sEJg== X-Received: by 2002:a17:902:f641:b0:181:b25e:e7bc with SMTP id m1-20020a170902f64100b00181b25ee7bcmr18721589plg.46.1669373403042; Fri, 25 Nov 2022 02:50:03 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id j7-20020a170902da8700b00188f7ad561asm3055966plx.249.2022.11.25.02.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 02:50:02 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , 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 3/4] .gitlab-ci.d/windows.yml: Exclude qTests from 64-bit CI job for now Date: Fri, 25 Nov 2022 18:49:50 +0800 Message-Id: <20221125104951.3169611-3-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221125104951.3169611-1-bmeng.cn@gmail.com> References: <20221125104951.3169611-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=bmeng.cn@gmail.com; helo=mail-pl1-x62a.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 --- .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 c6de65c784..fce9a02387 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 --enable-capstone --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 10:49:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 13055749 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 A858CC4332F for ; Fri, 25 Nov 2022 10:51:00 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyWHa-0004ya-Pj; Fri, 25 Nov 2022 05:50:10 -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 1oyWHY-0004yB-Rl for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:08 -0500 Received: from mail-pg1-x52e.google.com ([2607:f8b0:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyWHX-0004aL-7R for qemu-devel@nongnu.org; Fri, 25 Nov 2022 05:50:08 -0500 Received: by mail-pg1-x52e.google.com with SMTP id s196so3660083pgs.3 for ; Fri, 25 Nov 2022 02:50:06 -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=Q6Gvq2gAiT68ZCAp1/KdoTRz/X2igHEIB7J2KA7Fe24=; b=WVtqocBNZFqk5/do8KpUY6t5kwt6C5bDV31rqp7IY+zjlt/WxJEMvxbZFi6oqd2nj0 oj0U57ZEeIzkG9OzZ+jWP0IAnq9+pZatnod4nZBZu99obqWtOyqLpDJBr/CK1XQVMXbP 0yTIxXwsImCyyDfvsEQ+kpRT4sFdyP0PfRPKNP1to2jH8XTkihw7PqcWqlCnEDpQxxx4 k+T3eWuunYENBjTdFzNxlOeXnSSLuNVCzcQ5phQMcM5LUYwnp4240T8djCuNDIbBTHXG vtVJLC9Rit2mv7ewNcet8PRKbtL9IdhD/piArTDs7IQeAwLEyS0u09s4ETJVv4n43CW3 MGWg== 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=Q6Gvq2gAiT68ZCAp1/KdoTRz/X2igHEIB7J2KA7Fe24=; b=srsxgJyJSPMjEEESdf/1JohpPEAVaGXUt+uNqlfGM8rQjSme16Ac2gmerKYbiHH5Va UArgNS23FfnDKFUWFjd+RnVEvXQcDDB6enJQrHBHhXz6g6X4qiOA0ON5sA1s9p3aOUEl teSdpyMQcdpAypwZXz6HBZhz5XH1GX5ED74twvsiIYSrxzUjS5JJk+cPaExZsG8cvFPu W6se6h1tKVQl82ITvxhEg/0ILWxzBIFf97IsGerD0VMIPoZDb8MrjpzKR03PJmfxWq3Y CiIgE82PWfc+yp2R3evaDctnAkO5/j9G9nfMJDR63kaWofdQp/mMBQbbdmTk8RHyx6Tm QmTw== X-Gm-Message-State: ANoB5pnHzO5cyG23mutXDvHNwRlSvr8k01j0J7VKffkNPsu9gElhXRc8 vVYyk4shrL8KBlPK88EJg6rtn3sAPIk= X-Google-Smtp-Source: AA0mqf54nHYKYbYhtvsldOJSpE0IZ7actmE1gFlYREBGDJde6b5ekSM5jz7g7V8IChsFPDqRu18h4w== X-Received: by 2002:a63:fc1b:0:b0:46f:fea7:4816 with SMTP id j27-20020a63fc1b000000b0046ffea74816mr15401947pgi.532.1669373405684; Fri, 25 Nov 2022 02:50:05 -0800 (PST) Received: from ubuntu.. (144.168.56.201.16clouds.com. [144.168.56.201]) by smtp.gmail.com with ESMTPSA id j7-20020a170902da8700b00188f7ad561asm3055966plx.249.2022.11.25.02.50.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Nov 2022 02:50:05 -0800 (PST) From: Bin Meng To: qemu-devel@nongnu.org Cc: Thomas Huth , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Bin Meng , Laurent Vivier , Paolo Bonzini Subject: [PATCH 4/4] tests/qtest: Enable qtest build on Windows Date: Fri, 25 Nov 2022 18:49:51 +0800 Message-Id: <20221125104951.3169611-4-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221125104951.3169611-1-bmeng.cn@gmail.com> References: <20221125104951.3169611-1-bmeng.cn@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=bmeng.cn@gmail.com; helo=mail-pg1-x52e.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 --- 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,