From patchwork Fri Apr 21 23:48:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Levinson X-Patchwork-Id: 3463 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp521880vsd; Fri, 21 Apr 2017 16:48:41 -0700 (PDT) X-Received: by 10.28.105.11 with SMTP id e11mr807451wmc.7.1492818521016; Fri, 21 Apr 2017 16:48:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 62si16348655wrp.270.2017.04.21.16.48.40; Fri, 21 Apr 2017 16:48:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D11286898B1; Sat, 22 Apr 2017 02:48:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from white.spiritone.com (white.spiritone.com [216.99.193.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59EA0689820 for ; Sat, 22 Apr 2017 02:48:21 +0300 (EEST) Received: from [192.168.3.101] (184-100-196-223.ptld.qwest.net [184.100.196.223]) by white.spiritone.com (Postfix) with ESMTPSA id 68FDA73404AB for ; Fri, 21 Apr 2017 16:48:29 -0700 (PDT) To: FFmpeg development discussions and patches References: <20170421151704.0dfdf7f7@jagoff.localdomain> From: Aaron Levinson Message-ID: <06919b3e-86f4-8821-e3cc-e800c2c521d9@aracnet.com> Date: Fri, 21 Apr 2017 16:48:27 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170421151704.0dfdf7f7@jagoff.localdomain> Subject: Re: [FFmpeg-devel] [PATCH] Added additional note to fate.texi to describe the importance of not checking out files from git with core.autocrlf set to true X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On 4/21/2017 4:17 PM, Lou Logan wrote: > On Fri, 21 Apr 2017 16:05:16 -0700 > Aaron Levinson wrote: > >> From 7ea6455cd52ffe561f94bf03f48c4c2cf61b33c5 Mon Sep 17 00:00:00 2001 >> From: Aaron Levinson >> Date: Fri, 21 Apr 2017 15:55:11 -0700 >> Subject: [PATCH] Added additional note to fate.texi to describe the importance >> of not checking out files from git with core.autocrlf set to true >> >> Purpose: Added additional note to fate.texi to describe the importance >> of not checking out files from git with core.autocrlf set to true. >> When CRLF is used for line endings, this causes the source FATE test, >> which uses check-source.sh, to fail. The issue has to do with the use >> of git grep, which doesn't appear to be able to handle CRLF line >> endings. Older versions of check-source.sh used grep directly, which >> seems to do a better job of handling CRLF line endings. >> >> Note: thanks to Hendrik Leppkes for suggestion that the issue with >> FATE failing was caused by CRLF line endings. >> --- >> doc/fate.texi | 9 +++++++++ >> 1 file changed, 9 insertions(+) >> >> diff --git a/doc/fate.texi b/doc/fate.texi >> index 7a96c25..80fac0a 100644 >> --- a/doc/fate.texi >> +++ b/doc/fate.texi >> @@ -77,6 +77,15 @@ FATE_SAMPLES=fate-suite/ make fate >> @float NOTE >> Do not put a '~' character in the samples path to indicate a home >> directory. Because of shell nuances, this will cause FATE to fail. >> + >> +In addition, FATE will fail if files are checked out from git such >> +that CRLF is used for line endings. This will occur on Windows when >> +git is installed using the default options, because that causes git's >> +core.autocrlf setting to be set to 'true'. Make sure to set >> +core.autocrlf to 'input' or 'false', or, in the case that the >> +repository has already been cloned, it is possible to get past this by >> +executing the following command in the top-level ffmpeg directory: >> +@command{find -name '*.h' -type f | xargs dos2unix}. >> @end float > > This is a non-blocking minor comment, but it would be nice to add some > additional markup to core.autocrlf and true/false. For a list see: > > How about the following? Thanks, Aaron Levinson ------------------------------------------------------------------------------------ From 707b61cfcc648eb228a157ce2c9ed0f61a2ba5ca Mon Sep 17 00:00:00 2001 From: Aaron Levinson Date: Fri, 21 Apr 2017 16:45:28 -0700 Subject: [PATCH] Added additional note to fate.texi to describe the importance of not checking out files from git with core.autocrlf set to true Purpose: Added additional note to fate.texi to describe the importance of not checking out files from git with core.autocrlf set to true. When CRLF is used for line endings, this causes the source FATE test, which uses check-source.sh, to fail. The issue has to do with the use of git grep, which doesn't appear to be able to handle CRLF line endings. Older versions of check-source.sh used grep directly, which seems to do a better job of handling CRLF line endings. Note: thanks to Hendrik Leppkes for suggestion that the issue with FATE failing was caused by CRLF line endings. --- doc/fate.texi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/fate.texi b/doc/fate.texi index 7a96c25..f3b8c0c8 100644 --- a/doc/fate.texi +++ b/doc/fate.texi @@ -77,6 +77,16 @@ FATE_SAMPLES=fate-suite/ make fate @float NOTE Do not put a '~' character in the samples path to indicate a home directory. Because of shell nuances, this will cause FATE to fail. + +In addition, FATE will fail if files are checked out from git such +that @kbd{@key{CR}@key{LF}} is used for line endings. This will occur +on Windows when git is installed using the default options, because +that causes git's @var{core.autocrlf} setting to be set to +@option{true}. Make sure to set @var{core.autocrlf} to @option{input} +or @option{false}, or, in the case that the repository has already +been cloned, it is possible to get past this by executing the +following command in the top-level ffmpeg directory: @command{find +-name '*.h' -type f | xargs dos2unix}. @end float To use a custom wrapper to run the test, pass @option{--target-exec} to