From patchwork Wed Sep 9 18:42:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11766051 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 27A49698 for ; Wed, 9 Sep 2020 18:44:25 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D48A120C09 for ; Wed, 9 Sep 2020 18:44:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Des3wqgj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D48A120C09 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56796 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG54x-00029n-Ux for patchwork-qemu-devel@patchwork.kernel.org; Wed, 09 Sep 2020 14:44:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG53a-0000C5-Kd; Wed, 09 Sep 2020 14:42:58 -0400 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]:35528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kG53Z-0007nc-11; Wed, 09 Sep 2020 14:42:58 -0400 Received: by mail-pg1-x530.google.com with SMTP id g29so2730451pgl.2; Wed, 09 Sep 2020 11:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=27ajP4GoRfKO+nbwUgNlBqHfhHBZSCkZ9ODFQ91KtVY=; b=Des3wqgjyzKES2s1MAa0FiHP0fuQg0MGzcRFkXx4BwsJng2qL0zDOwI+0aL0BSKQfe +c1He5fbA/amtNx12jp98XrW0nZMH3JV3pSncU6hdS2dsWWMwwQwL4VhdyQ5dqcZJGHv Tb6qH1dO8rSK1HADQHkame30QnrZrN54f7vsN+2eP8TKBKeyo8g/mBSRs4ad79aH4iwH u5GtQk2RKVOESXeUIVGyXHGIdYJN9aYjTrDa3P8PKQ09aP9cm2cr8LHwaHYN89oeg+e8 UasdBFpSJRL7Hwe6iQUmTYjy+p3Jc24j8d28R0ecL/HGcpdTv/DmDggsmB0h4vaN78By L8xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=27ajP4GoRfKO+nbwUgNlBqHfhHBZSCkZ9ODFQ91KtVY=; b=aGWbJYkmv4J6MbHwSqi+DcLQHIH4gAsfsCmZO1+vQ+d52iBzwUPryyt+BZWdarlLyr 6PdvXSJUSB9okzhrIFZD5xoOq4hMu9pEAFbi3Uxrw4aHT7auXMeTV7auQpbawvDdPr9X n35f+ESqIKq4rxMMqBWJoyDEEBEyYAyK/XBD0Q2OH9Qpcspg0nMBaKYqS6PFr+uBeFBC xvrOrRbpFrm7ZppMWE9x536P9P4kqOGP3uCwAp9lBCew54nbWe1FIg9MK9RSkBKml140 jhNjCDyGZEwLVnCYxjLWd9LWpM78fUsN9hBErjwFXpwAqn+icNhT091/oEV0WmN4NijM 3pPw== X-Gm-Message-State: AOAM530X4w575XuGEd3rqTiJdAXIT19rGzBcLvVZIfPBvGuLOe1FIwuk usCwFXgkEwGtOkiVJJaWdxBdH/GbebDsLrpw X-Google-Smtp-Source: ABdhPJxA9J7uDvDteqIq4+XUNOb/EN6yoSbvlAEJzKoG+jogLNL39ejdq6jVPxRBNYdnilWdZgpjnQ== X-Received: by 2002:a62:301:0:b029:13c:1611:6528 with SMTP id 1-20020a6203010000b029013c16116528mr2070781pfd.8.1599676974483; Wed, 09 Sep 2020 11:42:54 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 63sm3521673pfw.42.2020.09.09.11.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 11:42:53 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v6 08/25] tests: disable /char/stdio/* tests in test-char.c on win32 Date: Thu, 10 Sep 2020 02:42:35 +0800 Message-Id: <20200909184237.765-1-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::530; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x530.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Ed Maste , Michael Roth , qemu-block@nongnu.org, Stefan Weil , Xie Changlong , Peter Lieven , Markus Armbruster , Max Reitz , Yonggang Luo , Gerd Hoffmann , Wen Congyang , Paolo Bonzini , Richard Henderson , Li-Wen Hsu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" These tests are blocking test-char to be finished. Disable them by using variable is_win32, so we doesn't need macro to open it. and easy recover those function latter. Signed-off-by: Yonggang Luo --- tests/test-char.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/test-char.c b/tests/test-char.c index d35cc839bc..184ddceab8 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -77,7 +77,6 @@ static void fe_event(void *opaque, QEMUChrEvent event) } } -#ifdef _WIN32 static void char_console_test_subprocess(void) { QemuOpts *opts; @@ -102,7 +101,7 @@ static void char_console_test(void) g_test_trap_assert_passed(); g_test_trap_assert_stdout("CONSOLE"); } -#endif + static void char_stdio_test_subprocess(void) { Chardev *chr; @@ -1448,7 +1447,11 @@ static SocketAddress unixaddr = { int main(int argc, char **argv) { - bool has_ipv4, has_ipv6; + bool has_ipv4, has_ipv6, is_win32 = false; + +#ifdef _WIN32 + is_win32 = true; +#endif qemu_init_main_loop(&error_abort); socket_init(); @@ -1467,12 +1470,15 @@ int main(int argc, char **argv) g_test_add_func("/char/invalid", char_invalid_test); g_test_add_func("/char/ringbuf", char_ringbuf_test); g_test_add_func("/char/mux", char_mux_test); -#ifdef _WIN32 - g_test_add_func("/char/console/subprocess", char_console_test_subprocess); - g_test_add_func("/char/console", char_console_test); -#endif - g_test_add_func("/char/stdio/subprocess", char_stdio_test_subprocess); - g_test_add_func("/char/stdio", char_stdio_test); + if (0) { + g_test_add_func("/char/console/subprocess", char_console_test_subprocess); + g_test_add_func("/char/console", char_console_test); + } + + if (!is_win32) { + g_test_add_func("/char/stdio/subprocess", char_stdio_test_subprocess); + g_test_add_func("/char/stdio", char_stdio_test); + } #ifndef _WIN32 g_test_add_func("/char/pipe", char_pipe_test); #endif @@ -1534,7 +1540,7 @@ int main(int argc, char **argv) g_test_add_data_func("/char/socket/client/dupid-reconnect/" # name, \ &client8 ##name, char_socket_client_dupid_test) - if (has_ipv4) { + if (has_ipv4 && !is_win32) { SOCKET_SERVER_TEST(tcp, &tcpaddr); SOCKET_CLIENT_TEST(tcp, &tcpaddr); g_test_add_data_func("/char/socket/server/two-clients/tcp", &tcpaddr, From patchwork Wed Sep 9 18:42:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11766063 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93CD7698 for ; Wed, 9 Sep 2020 18:52:25 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 173452078B for ; Wed, 9 Sep 2020 18:52:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NJlJQYeg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 173452078B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:49410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG5Ci-0002Js-6n for patchwork-qemu-devel@patchwork.kernel.org; Wed, 09 Sep 2020 14:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG53k-0000Ls-AT; Wed, 09 Sep 2020 14:43:08 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:45315) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kG53d-0007ny-SW; Wed, 09 Sep 2020 14:43:07 -0400 Received: by mail-pg1-x544.google.com with SMTP id 67so2692456pgd.12; Wed, 09 Sep 2020 11:43:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wvwUANr59f9uuudazEg+hKm+epX9PoFUd8dpqevdGUY=; b=NJlJQYegoy6xhrpRgGp96KhIHzCj0TDN2M9Jtu0lmeM/Z4Z7xEeDGpfBJCHc4DVntk ZGXhTkXWCAuJqhEHgU5OCexH/8I852NNvVFhOAQNOXGFAIheLlC8yaWGBSpH/M7LR6h9 XZSlhLNpOQDSp/jPEEr9m7jk8GyKGM820HrfAiyN6ISGJ14wq8GzZ4v/hNK5xaVpypTG 09r22LRKWjpsrNHgxTLHN5mIB+Xs42lxijftBZ3tHQGSigXeKqakGofy/NBgF+eWdijs 1LmqdBLCe1+zGiipJQqR1v9S28GrQ+eLsnvb6RoaEGIgR2MYo+18zFF8fU5KXmlvBl0O v7Ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wvwUANr59f9uuudazEg+hKm+epX9PoFUd8dpqevdGUY=; b=uoWS9nDpRH/184VL/9z/oC6dpr/Y2AUaiQZ/u9Y0Sd9VgV5b17WlGJrbSOn7DtP4iD sgyi6MQJkQTMOhWJ++COepXzAd7tdzzjqzWMolk6pmU4fCna7jYGaITGMPZ5ybEJzTL0 8zLBN51yO+EyaVXu2zivRhJ0FhauTRt6he3rrEJGqfYCt8+1XKSRIomJKyrXIcNVhM4g OPOPgAg8mmPaQ69vm0UCWGQZvTTuCtiLDgv54riNpE7ALH6CzeWLR4O/ZmB6zyjhhgzI ndvepxRld8uDD7nXwrbxxq07IuJRrIX+hVSud2j+p8ZuSXbDEdnmkQ04Sh2p26weCH0s gWSA== X-Gm-Message-State: AOAM532C3kDcrR5eeNm6VKNTsOKBvJ+rNypl7JP+BQAmi+FyWDks1YBE m7yCzjnnoAafe6FtRQIc5pjhLuOk0ktvhvcx X-Google-Smtp-Source: ABdhPJw/wJIc0S1WARZ9G0FkPcSG6IL9Zxoq00AC8U116Y76CFh1+1bLud3/Q8lmxF6sZvJX7a9/Hw== X-Received: by 2002:a63:5966:: with SMTP id j38mr1567003pgm.187.1599676979453; Wed, 09 Sep 2020 11:42:59 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 63sm3521673pfw.42.2020.09.09.11.42.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 11:42:58 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v6 24/25] ci: Enable msys2 ci in cirrus Date: Thu, 10 Sep 2020 02:42:36 +0800 Message-Id: <20200909184237.765-2-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200909184237.765-1-luoyonggang@gmail.com> References: <20200909184237.765-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::544; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Ed Maste , Michael Roth , qemu-block@nongnu.org, Stefan Weil , Xie Changlong , Peter Lieven , Markus Armbruster , Max Reitz , Yonggang Luo , Gerd Hoffmann , Wen Congyang , Paolo Bonzini , Richard Henderson , Li-Wen Hsu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Install msys2 in a proper way refer to https://github.com/cirruslabs/cirrus-ci-docs/issues/699 The https://wiki.qemu.org/Hosts/W32#Native_builds_with_MSYS2 need to be updated. There is no need of --cross-prefix, open mingw64.exe instead of msys2.exe then we don't need the --cross-prefix, besides we using environment variable settings: MSYS: winsymlinks:nativestrict MSYSTEM: MINGW64 CHERE_INVOKING: 1 to opening mingw64 native shell. We now running tests with make -i check to skip tests errors. Signed-off-by: Yonggang Luo Reviewed-by: Daniel P. Berrangé --- .cirrus.yml | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index a18971aac4..fa6edf1d5c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -44,3 +44,63 @@ macos_xcode_task: --enable-werror --cc=clang || { cat config.log; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - gmake check + +windows_msys2_task: + windows_container: + image: cirrusci/windowsservercore:cmake + os_version: 2019 + cpu: 8 + memory: 8G + env: + MSYS: winsymlinks:nativestrict + MSYSTEM: MINGW64 + CHERE_INVOKING: 1 + printenv_script: + - C:\tools\msys64\usr\bin\bash.exe -lc 'printenv' + install_script: + - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools && curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools && curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd /c/tools && pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz" + - C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sy --noconfirm" + - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --needed --noconfirm -S bash pacman pacman-mirrors msys2-runtime" + - taskkill /F /IM gpg-agent.exe + - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -Su" + - C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --needed + base-devel + git + mingw-w64-x86_64-python + mingw-w64-x86_64-python-setuptools + mingw-w64-x86_64-toolchain + mingw-w64-x86_64-SDL2 + mingw-w64-x86_64-SDL2_image + mingw-w64-x86_64-gtk3 + mingw-w64-x86_64-glib2 + mingw-w64-x86_64-ninja + mingw-w64-x86_64-make + mingw-w64-x86_64-jemalloc + mingw-w64-x86_64-lzo2 + mingw-w64-x86_64-zstd + mingw-w64-x86_64-libjpeg-turbo + mingw-w64-x86_64-pixman + mingw-w64-x86_64-libgcrypt + mingw-w64-x86_64-capstone + mingw-w64-x86_64-libpng + mingw-w64-x86_64-libssh + mingw-w64-x86_64-libxml2 + mingw-w64-x86_64-snappy + mingw-w64-x86_64-libusb + mingw-w64-x86_64-usbredir + mingw-w64-x86_64-libtasn1 + mingw-w64-x86_64-libnfs + mingw-w64-x86_64-nettle + mingw-w64-x86_64-cyrus-sasl + mingw-w64-x86_64-curl + mingw-w64-x86_64-gnutls + mingw-w64-x86_64-zstd" + script: + - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3 --ninja=ninja" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j$NUMBER_OF_PROCESSORS" + test_script: + - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check" + From patchwork Wed Sep 9 18:42:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11766049 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2ABFF698 for ; Wed, 9 Sep 2020 18:44:19 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B483D2080C for ; Wed, 9 Sep 2020 18:44:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eZozQ3uq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B483D2080C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:56534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kG54r-000239-P4 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 09 Sep 2020 14:44:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57214) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kG53m-0000NO-Ax; Wed, 09 Sep 2020 14:43:10 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]:34687) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kG53k-0007oR-Qx; Wed, 09 Sep 2020 14:43:10 -0400 Received: by mail-pf1-x42b.google.com with SMTP id v196so3070542pfc.1; Wed, 09 Sep 2020 11:43:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VE49ZNwXmJO0oiZLGn66FYFMfa5GjTxPVHs0mRhL2ZU=; b=eZozQ3uq8l8PQp0TiptQYeoJoDOLixwzFMLfKGy1YoSpn4sjSimEilxMqzPZk5cLCc oZ/AevTMx3JUhbjLTXXJEdwwmIAEZ9aIa54gGeZw36RTPkbRc9GhTcR9Hy64xcjcwx5v 6uLLDKS25zfAuTQxw31TXYRNyWm1IMzZm9aTFH5aQ1dAomj55XVO+JVWnq7Ui603Q/Gm ngloVGMOs7M1yXIQRRtBOEIm3pzkDmE0E7vSTqn049l0q0uDZlpSUFI4+73BguIakuUZ Llrysz0rFnfmimgZUAoKaFoDes9giV4yLX4DDpHjNCOIU1vo+7CTEBNP696buc8MlWCZ jdAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VE49ZNwXmJO0oiZLGn66FYFMfa5GjTxPVHs0mRhL2ZU=; b=VySR6K6xOxa//fInb56z4wrgZKXAiu9Rm9p1pu0m06D8H88xDkZ6ds8vTpHNebIWyD BdaGwo1r/GqTqqYapH8/SArLlakEe0fSPMssKkNLwku963c2neo78y9aCyQF8qRFrGtT mcmAGG8nVwkAkEh8r53kdffiXk4TN5qRGvPWVDW/OYETKsrASzMIs7h8aN85lnCpwVkg Fp3ze+alC9hcbvu3kBrhudEJB6DpJ/LvdlmQpzLNRkyJYt/s1ABJhP5IMqcGycOqI/J0 aMVb8WvPVajFQpyTD1+B6yGhKYPH15sw/B59gJ8Xsj1j+aCktca3nIMCklJeXDdrl183 4rgg== X-Gm-Message-State: AOAM532rmi9glzoRZVy4oJDxASG/BiAioVZjwY/n3ao8ar6R/SpFkxdP CFuYeFEHLrJWnwkB5N24Wa88+aBf807eyZkp X-Google-Smtp-Source: ABdhPJzQhYdhaWE0AuhnSSYJ4PrEu8rrJy/l1EwX9Rr1oh7wpqJBE4Efc93R4P6pAGpFLEXVinc4XQ== X-Received: by 2002:a17:902:a40e:: with SMTP id p14mr2031587plq.4.1599676983844; Wed, 09 Sep 2020 11:43:03 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 63sm3521673pfw.42.2020.09.09.11.42.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 11:43:03 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v6 25/25] meson: guard the minimal meson version to 0.55.1 Date: Thu, 10 Sep 2020 02:42:37 +0800 Message-Id: <20200909184237.765-3-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200909184237.765-1-luoyonggang@gmail.com> References: <20200909184237.765-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x42b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Ed Maste , Michael Roth , qemu-block@nongnu.org, Stefan Weil , Xie Changlong , Peter Lieven , Markus Armbruster , Max Reitz , Yonggang Luo , Gerd Hoffmann , Wen Congyang , Paolo Bonzini , Richard Henderson , Li-Wen Hsu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" So we can removal usage of unstable-keyval Signed-off-by: Yonggang Luo --- meson.build | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 0b1741557d..af34a85bec 100644 --- a/meson.build +++ b/meson.build @@ -1,14 +1,11 @@ -project('qemu', ['c'], meson_version: '>=0.55.0', +project('qemu', ['c'], meson_version: '>=0.55.1', default_options: ['warning_level=1', 'c_std=gnu99', 'cpp_std=gnu++11', 'b_colorout=auto'], version: run_command('head', meson.source_root() / 'VERSION').stdout().strip()) not_found = dependency('', required: false) -if meson.version().version_compare('>=0.56.0') - keyval = import('keyval') -else - keyval = import('unstable-keyval') -endif +keyval = import('keyval') + ss = import('sourceset') sh = find_program('sh')