From patchwork Wed May 3 19:46:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Levinson X-Patchwork-Id: 3568 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp203866vsd; Wed, 3 May 2017 12:47:09 -0700 (PDT) X-Received: by 10.223.139.25 with SMTP id n25mr24983929wra.17.1493840829676; Wed, 03 May 2017 12:47:09 -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 g48si25085992wrg.239.2017.05.03.12.47.09; Wed, 03 May 2017 12:47:09 -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 719EA689800; Wed, 3 May 2017 22:47:02 +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 948BA689726 for ; Wed, 3 May 2017 22:46:56 +0300 (EEST) Received: from [10.147.119.95] (unknown [166.177.248.168]) by white.spiritone.com (Postfix) with ESMTPSA id 29E1973404AA for ; Wed, 3 May 2017 12:46:57 -0700 (PDT) To: FFmpeg development discussions and patches From: Aaron Levinson Message-ID: Date: Wed, 3 May 2017 12:46:44 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] doc: Enhanced fate.texi to reference Windows line endings section from git-howto.texi 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" From 345a98d31c6c758f0f82edab1b502cd8aeb3354b Mon Sep 17 00:00:00 2001 From: Aaron Levinson Date: Wed, 3 May 2017 12:38:39 -0700 Subject: [PATCH] doc: Enhanced fate.texi to reference Windows line endings section from git-howto.texi Purpose: Enhanced fate.texi to indicate that FATE will fail if files are checked out with Windows line endings (CRLF) and added reference to Windows line endings anchor in git-howto.texi for how to address. Also added Windows line endings anchor in git-howto.texi. The exact problem caused by CRLF endings occurs with check-source.sh, which uses git grep. git grep doesn't appear to be able to handle CRLF line endings. Note: thanks to Hendrik Leppkes for suggestion that the issue with FATE failing was caused by CRLF line endings. Signed-off-by: Aaron Levinson --- doc/fate.texi | 5 +++++ doc/git-howto.texi | 1 + 2 files changed, 6 insertions(+) diff --git a/doc/fate.texi b/doc/fate.texi index 7a96c25..c498336 100644 --- a/doc/fate.texi +++ b/doc/fate.texi @@ -77,6 +77,11 @@ 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. Please refer to +@ref{Windows line endings,,Windows line endings,git-howto} in the +FFmpeg documentation for more information. @end float To use a custom wrapper to run the test, pass @option{--target-exec} to diff --git a/doc/git-howto.texi b/doc/git-howto.texi index 2b4fb80..f2b6182 100644 --- a/doc/git-howto.texi +++ b/doc/git-howto.texi @@ -80,6 +80,7 @@ create patches after making a read-only ffmpeg-web clone: git clone git://ffmpeg.org/ffmpeg-web @end example +@anchor{Windows line endings} Make sure that you do not have Windows line endings in your checkouts, otherwise you may experience spurious compilation failures. One way to achieve this is to run