From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23696C43461 for ; Sun, 13 Sep 2020 18:51:17 +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 605A822206 for ; Sun, 13 Sep 2020 18:51:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="jOafTRsq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 605A822206 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:41026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHX5m-0007Mg-AO for qemu-devel@archiver.kernel.org; Sun, 13 Sep 2020 14:51:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHX4a-0006Xn-9J for qemu-devel@nongnu.org; Sun, 13 Sep 2020 14:50:00 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:33670 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kHX4X-0003kn-4E for qemu-devel@nongnu.org; Sun, 13 Sep 2020 14:49:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600022995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=SdR+d90uwChYoqNy4GUAywHiGGxX1xDr9mQXVtb+8ts=; b=jOafTRsqMyjjUrTDGxUBghESSNRtXdZc+N5cgc/t67VwsvFT1x6Zi0dKGBcX1h+5K33+cm bAqqdD6IxbV1Vzwue34Ywi5Hh4C6uoluvB28MRv4IXOB6ZLEITBxHGJy1n15MCYg05k+DH w2IZUb1jfdk1odL+PKMFNTmH/YzB3Wo= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-481-2pYEYJJENMqSa-9wGAUOTQ-1; Sun, 13 Sep 2020 14:49:52 -0400 X-MC-Unique: 2pYEYJJENMqSa-9wGAUOTQ-1 Received: by mail-wr1-f69.google.com with SMTP id n15so5827563wrv.23 for ; Sun, 13 Sep 2020 11:49:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=SdR+d90uwChYoqNy4GUAywHiGGxX1xDr9mQXVtb+8ts=; b=Z53l15WeHHAeOvbUMXwNVSBlVrO1NlMOr+YetbXlkATtTXZqh2nXTJMBPaEZOmVpNs r0hZvBntyX85/hRIXMhne7tcoqJHnnn0OXcvpG5uJuqaCxn7xNByxHwNMdWFUiItyXst hbycU6lx23Uln3X0012+BQcsRQI+HLVwaFmjokTHfccKi4SEtvnnTRj2r5rYgD5RoY7w +KCKY1n7W4j6MVVR6Mcj86FB8d13G1rLeSIUO/NWWEAwr4LyQ49saO6j/YlRN7WEo4sP PBCjdUIjg/fyAwtDMpynFoYBAmc5KAy3/pSxlXunk3vk6r9kQxuZ63lkzjNow1i0cbjI DAAA== X-Gm-Message-State: AOAM532wJDuM+CsIRdVrDG53U3HfMX+FLTszw0r2h165nrd+wWnaDmc+ QqWjl+VGhE0VcUHtbfCl+QNzmbKRfy0nu9Y8JYf36l3Jz/DchXx8fwsYk21q9VIRaEDYVQYIiOS /pis6d4+BLPUbgG8= X-Received: by 2002:adf:e304:: with SMTP id b4mr11812993wrj.141.1600022991729; Sun, 13 Sep 2020 11:49:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSL7qVDRxnHKGpwVzD3K1j/HjVGL2yvenaRhCs3mWduOnt6q3ALNPiZPofnIprMhquVX3Ltg== X-Received: by 2002:adf:e304:: with SMTP id b4mr11812962wrj.141.1600022991407; Sun, 13 Sep 2020 11:49:51 -0700 (PDT) Received: from [192.168.1.36] (65.red-83-57-170.dynamicip.rima-tde.net. [83.57.170.65]) by smtp.gmail.com with ESMTPSA id n10sm3235113wmk.7.2020.09.13.11.49.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Sep 2020 11:49:50 -0700 (PDT) Subject: Re: [PATCH v8 11/27] meson: Use -b to ignore CR vs. CR-LF issues on Windows To: luoyonggang@gmail.com, Thomas Huth References: <20200912224431.1428-1-luoyonggang@gmail.com> <20200912224431.1428-12-luoyonggang@gmail.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Autocrypt: addr=philmd@redhat.com; keydata= mQINBDXML8YBEADXCtUkDBKQvNsQA7sDpw6YLE/1tKHwm24A1au9Hfy/OFmkpzo+MD+dYc+7 bvnqWAeGweq2SDq8zbzFZ1gJBd6+e5v1a/UrTxvwBk51yEkadrpRbi+r2bDpTJwXc/uEtYAB GvsTZMtiQVA4kRID1KCdgLa3zztPLCj5H1VZhqZsiGvXa/nMIlhvacRXdbgllPPJ72cLUkXf z1Zu4AkEKpccZaJspmLWGSzGu6UTZ7UfVeR2Hcc2KI9oZB1qthmZ1+PZyGZ/Dy+z+zklC0xl XIpQPmnfy9+/1hj1LzJ+pe3HzEodtlVA+rdttSvA6nmHKIt8Ul6b/h1DFTmUT1lN1WbAGxmg CH1O26cz5nTrzdjoqC/b8PpZiT0kO5MKKgiu5S4PRIxW2+RA4H9nq7nztNZ1Y39bDpzwE5Sp bDHzd5owmLxMLZAINtCtQuRbSOcMjZlg4zohA9TQP9krGIk+qTR+H4CV22sWldSkVtsoTaA2 qNeSJhfHQY0TyQvFbqRsSNIe2gTDzzEQ8itsmdHHE/yzhcCVvlUzXhAT6pIN0OT+cdsTTfif MIcDboys92auTuJ7U+4jWF1+WUaJ8gDL69ThAsu7mGDBbm80P3vvUZ4fQM14NkxOnuGRrJxO qjWNJ2ZUxgyHAh5TCxMLKWZoL5hpnvx3dF3Ti9HW2dsUUWICSQARAQABtDJQaGlsaXBwZSBN YXRoaWV1LURhdWTDqSAoUGhpbCkgPHBoaWxtZEByZWRoYXQuY29tPokCVQQTAQgAPwIbDwYL CQgHAwIGFQgCCQoLBBYCAwECHgECF4AWIQSJweePYB7obIZ0lcuio/1u3q3A3gUCXsfWwAUJ KtymWgAKCRCio/1u3q3A3ircD/9Vjh3aFNJ3uF3hddeoFg1H038wZr/xi8/rX27M1Vj2j9VH 0B8Olp4KUQw/hyO6kUxqkoojmzRpmzvlpZ0cUiZJo2bQIWnvScyHxFCv33kHe+YEIqoJlaQc JfKYlbCoubz+02E2A6bFD9+BvCY0LBbEj5POwyKGiDMjHKCGuzSuDRbCn0Mz4kCa7nFMF5Jv piC+JemRdiBd6102ThqgIsyGEBXuf1sy0QIVyXgaqr9O2b/0VoXpQId7yY7OJuYYxs7kQoXI 6WzSMpmuXGkmfxOgbc/L6YbzB0JOriX0iRClxu4dEUg8Bs2pNnr6huY2Ft+qb41RzCJvvMyu gS32LfN0bTZ6Qm2A8ayMtUQgnwZDSO23OKgQWZVglGliY3ezHZ6lVwC24Vjkmq/2yBSLakZE 6DZUjZzCW1nvtRK05ebyK6tofRsx8xB8pL/kcBb9nCuh70aLR+5cmE41X4O+MVJbwfP5s/RW 9BFSL3qgXuXso/3XuWTQjJJGgKhB6xXjMmb1J4q/h5IuVV4juv1Fem9sfmyrh+Wi5V1IzKI7 RPJ3KVb937eBgSENk53P0gUorwzUcO+ASEo3Z1cBKkJSPigDbeEjVfXQMzNt0oDRzpQqH2vp apo2jHnidWt8BsckuWZpxcZ9+/9obQ55DyVQHGiTN39hkETy3Emdnz1JVHTU0Q== Message-ID: Date: Sun, 13 Sep 2020 20:49:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US Received-SPF: pass client-ip=207.211.31.81; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/13 09:40:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.695, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-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 , Qemu-block , Stefan Weil , Xie Changlong , Peter Lieven , qemu-level , Michael Roth , Richard Henderson , Paolo Bonzini , Gerd Hoffmann , Wen Congyang , =?UTF-8?Q?Daniel_P_=2e_Berrang=c3=a9?= , Max Reitz , Li-Wen Hsu , Markus Armbruster Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 9/13/20 6:01 PM, 罗勇刚(Yonggang Luo) wrote: > > > On Sun, Sep 13, 2020 at 11:35 PM Philippe Mathieu-Daudé > > wrote: > > On 9/13/20 12:44 AM, Yonggang Luo wrote: > > On windows, a difference in line endings causes testsuite failures > > complaining that every single line in files such as > > 'tests/qapi-schemadoc-good.texi' is wrong.  Fix it by adding -b to > diff. > > Isn't '--strip-trailing-cr' more adapted? > > er, I did that before..... So, yes/no? We can not follow all patches, so better if you add a note about your changes, either in the patch description if you think it's worthwhile keeping that information in the git history, else below the '---' separator, so that information is stripped from the patch when applying. Looking at the archive I see Thomas said this option is not POSIX thus not portable. What about adding this? "Ideally we would use the '--strip-trailing-cr' option, but not being POSIX is a portability problem (i.e. BSDs and Solaris based OSes). Instead use the '-b' option which, although doing slightly more, produce the expected result on Windows." > > > > > Signed-off-by: Yonggang Luo > > > Reviewed-by: Eric Blake > > > Reviewed-by: Daniel P. Berrangé > > > --- > >  tests/qapi-schema/meson.build | 2 +- > >  1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tests/qapi-schema/meson.build > b/tests/qapi-schema/meson.build > > index c87d141417..f1449298b0 100644 > > --- a/tests/qapi-schema/meson.build > > +++ b/tests/qapi-schema/meson.build > > @@ -220,6 +220,6 @@ qapi_doc = custom_target('QAPI doc', > >  > >  # "full_path()" needed here to work around > >  # https://github.com/mesonbuild/meson/issues/7585 > > -test('QAPI doc', diff, args: ['-u', files('doc-good.texi'), > qapi_doc[0].full_path()], > > +test('QAPI doc', diff, args: ['-b', '-u', files('doc-good.texi'), > qapi_doc[0].full_path()], > >       depends: qapi_doc, > >       suite: ['qapi-schema', 'qapi-doc']) > > > > > > -- >          此致 > 礼 > 罗勇刚 > Yours >     sincerely, > Yonggang Luo