From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8992940364 for ; Tue, 13 Feb 2024 15:13:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6996668D109; Tue, 13 Feb 2024 17:13:46 +0200 (EET) Received: from mail8.parnet.fi (mail8.parnet.fi [77.234.108.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6F68768CDD1 for ; Tue, 13 Feb 2024 17:13:40 +0200 (EET) Received: from mail9.parnet.fi (mail9.parnet.fi [77.234.108.21]) by mail8.parnet.fi with ESMTP id 41DFDd8N019954-41DFDd8O019954; Tue, 13 Feb 2024 17:13:39 +0200 Received: from foo.martin.st (host-97-144.parnet.fi [77.234.97.144]) by mail9.parnet.fi (Postfix) with ESMTPS id 430D4A4D03; Tue, 13 Feb 2024 17:13:39 +0200 (EET) Date: Tue, 13 Feb 2024 17:13:38 +0200 (EET) To: FFmpeg development discussions and patches In-Reply-To: Message-ID: <2eba50a5-ac75-ff4f-226-cbdbecd6b36e@martin.st> References: MIME-Version: 1.0 X-FE-Policy-ID: 3:14:2:SYSTEM Subject: Re: [FFmpeg-devel] [PATCH] fate/subtitles: Ignore line endings for sub-scc test X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: =?utf-8?q?Martin_Storsj=C3=B6_via_ffmpeg-devel?= Reply-To: FFmpeg development discussions and patches Cc: =?ISO-8859-15?Q?Martin_Storsj=F6?= , Andreas Rheinhardt Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Tue, 13 Feb 2024, Andreas Rheinhardt wrote: > Since 7bf1b9b35769b37684dd2f18a54f01d852a540c8, > the test produces ordinary \n, yet this is not what the reference > file used for the most time, leading to test failures. > > Signed-off-by: Andreas Rheinhardt > --- > tests/fate/subtitles.mak | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak > index cea4c810dd..90412e9ac1 100644 > --- a/tests/fate/subtitles.mak > +++ b/tests/fate/subtitles.mak > @@ -114,6 +114,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s > > FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc > fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc > +fate-sub-scc: CMP = diff > > FATE_SUBTITLES-$(call DEMMUX, SCC, SCC) += fate-sub-scc-remux > fate-sub-scc-remux: CMD = fmtstdout scc -i $(TARGET_SAMPLES)/sub/witch.scc -ss 4:00 -map 0 -c copy > -- > 2.34.1 Looks ok to me, as a temporary measure until we figure out the best way to upgrade everybody's workdirs without needing interaction. (As an added note to the other thread; even if we could easily patch fate.sh, every current user's workdir is also prone to this issue, and the way of fixing it is kinda non-obvious.) // Martin _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".