From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id AD34F4BCFF for <ffmpegdev@gitmailbox.com>; Thu, 22 May 2025 11:12:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 19AE968D8BD; Thu, 22 May 2025 14:12:38 +0300 (EEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12olkn2063.outbound.protection.outlook.com [40.92.21.63]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 0C83768D702 for <ffmpeg-devel@ffmpeg.org>; Thu, 22 May 2025 14:12:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fkAl3ob4l1TrnqerITp6I5Hk0TSHpIjDDOipz+EiAiO1t1zJYoDPdWhSFOznS3yHbgTLUUwwmOnGBQcYKMtlF56+O/9IPJwAIpWqcdzgmQ1KWubKDvh0F8XlAtsL4yoH0UPUcn86hgO3aBXydUXVIOz/HC9X5wsjeNDgqKf5JJIO/AUbO15l0+xuwM797CntneSZF/EpTzprLQOZBf+hmnE3OX0KoC7mnWvaB4x9RSxHCrBhQ0rPlTzGg7V7RBEX5M+WEX8WyaXsIz+KvXsfKEuaId6sMiIOvEvmOu15zL+rYkaum/qwM48b+gAo+q9vSPefjr/CN3cPfe/OSjzQxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b3340GY7BWxL4/hgB4kf/56Ep70bRutamNkwIYxTER4=; b=hjGBaCuqm3v5vnGe/zfpc4KzseI/p1TrO2LDW1xln354Gm4FHY4wTpNsaM9JzmAbj8ooViidNl1w9ejHvCS2d4Pol9lDnjJF/nM2tf1fl7NXXMlapULl16SrxWo/cS6MldjgM85vlxIeH0EUCwcR32cNaLSLATfEItw2zxShB9uCh3IMjPmiuFjwBZVbExwRxFTZWwVNELUFxiMLc1D0btcqlk0eNVPOqPFTP8B6MZpUeEwPdjsQx5FWeaR6T7I5kGGvifSHXcpUo2EvxS+0oE+v3M4nR4pAlQnHa1oDofjELuSXMl5KJMXrebTkfjTrmXDikn2nuScao8PcYPiNpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b3340GY7BWxL4/hgB4kf/56Ep70bRutamNkwIYxTER4=; b=r5lrhiPYcvbQGPNs5TeOygZg3a7YTjshjkCNBmdMZIeCVsB1vhLBloJc2ZOKQrSENAJiQsNiHsQzfnrIH4+0YIUC31uP5lq21tzG286c7tnWeLtvUYPxLUCw8j5mQXs1puAlVcWK7HvGzXPjh1fnCB53YQbr8POkh9F9jMKpq1l5WqZF6XNFfP+eFkDKynsB4HSVDfRsL+m+R0Reg13G4OSXS2zzBjG/iZ+XhZbeZAXZz0kwQh9CqCh7LnJbPj4aYjPtk+3vzL0u2u4Xgbo4TARgk5/0JWxa6hUZcmhkbGBomCExtp3SAxqpEjtWgR3TOtLnn9bn1KimSfBBZyrffw== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DM8P223MB0192.NAMP223.PROD.OUTLOOK.COM (2603:10b6:5:316::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8769.20; Thu, 22 May 2025 11:12:28 +0000 Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7]) by DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM ([fe80::bf09:8e9:b07f:98a7%4]) with mapi id 15.20.8769.019; Thu, 22 May 2025 11:12:28 +0000 From: "softworkz ." <softworkz-at-hotmail.com@ffmpeg.org> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Thread-Topic: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic Thread-Index: AQHbxBKkDdKbnQxyBECC9Bj6Y37wTLPehA2AgAAApGA= Date: Thu, 22 May 2025 11:12:28 +0000 Message-ID: <DM8P223MB0365E2113266E9E6EE55E325BA99A@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM> References: <pull.77.ffstaging.FFmpeg.1747043987.ffmpegagent@gmail.com> <pull.77.v2.ffstaging.FFmpeg.1747146207.ffmpegagent@gmail.com> <73ab2c2be54d092246c42c0e243efedb049165ef.1747146207.git.ffmpegagent@gmail.com> <AS8P250MB07440B0EE200D9145F9B91D88F99A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> In-Reply-To: <AS8P250MB07440B0EE200D9145F9B91D88F99A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM8P223MB0365:EE_|DM8P223MB0192:EE_ x-ms-office365-filtering-correlation-id: f4d0bc92-569a-4d7d-16bc-08dd992189d3 x-microsoft-antispam: BCL:0; ARA:14566002|461199028|8060799009|7092599006|8062599006|15080799009|19110799006|102099032|440099028|3412199025|10035399007|34005399003; x-microsoft-antispam-message-info: =?us-ascii?Q?1Y3EVSw0MKddWWGAGcA1CkvFfuXgs8MJcWyEKfCfYbCIfXYYqlbx/uBSRK+N?= =?us-ascii?Q?iVMm11MxZfdDEsZxYbYEWR3SMiaod86zOnALIYVpLz/sX1JiBgmO14T/zOFm?= =?us-ascii?Q?HWmpUhYuvAdvWzTBsFP/24m/+5smtTSQgsnVYeW3Dic993wtW32JbWx17/Xj?= =?us-ascii?Q?0H0ky3oOFAx298TiNl6ctRTtw7uOK/1HG5w1NQ/MWbTFEYQRzalcGukyGcNI?= =?us-ascii?Q?HC2hK0e294dYvGBH9JNol6oAeAbAaivDBJlJ1XvJ/UeF4M4rG7zqPmfD2TWg?= =?us-ascii?Q?fNiisnGdTIFmzaVQWRjhZf13Vz07nueDnrh7Cc+Z+nWDdVMKkuzAMWUCt+Z1?= =?us-ascii?Q?WD1r0I3HBRuUrv0+C4CHiDIZRbAcxDsQFicGovgAt/7slfib4lI7RSv6D+0G?= =?us-ascii?Q?ynYHS2WOpiPOGA18HdJoMtOYR5QHVtg+keJHqMYaJmcgz/E+L51ZP4yVo5Cd?= =?us-ascii?Q?S6CAUaqukgD9kKS8QhMckASBfeEh25xJbJQMidsaZwEH82wz7pVHMEZWVHIR?= =?us-ascii?Q?X+jq+PrFqrG8TnIICYrLYCljVrk5tr8z4Qn/BZLx/OrUY/BU1cLyqtSFqJ1a?= =?us-ascii?Q?b7H/Sm4w0ul++OkTsgweY2/ylDwc3SncDj/HAkCgutQzcNlT/vfyuDyh8std?= =?us-ascii?Q?oh/tDp5nowK/fa3Vf/Cq3KamF98dwPOx8Mh41Ra7OSzGbgW8gGAtqiDDm8/U?= =?us-ascii?Q?1FBwJEOLztu5Q2IeB38AUZbShJvL0BUPrjWmpBipsynTmITJCUYRMiNIDlWD?= =?us-ascii?Q?vT3WqWihFPOFvA8OeoLdjgjTRSnU7373E2YIpB0F1UdymsKNGC6oaURwky3y?= =?us-ascii?Q?NYq30bp2YvTBez1hjgHCwvdJbmipitd4dIOhywDtvMpAQ2zDnCjJkuemCWih?= =?us-ascii?Q?LjtKPYkXKTObtYkfmnB13hBDnM0u351y72Xgg0yQtnbuXlT8ogKXKMG2slkz?= =?us-ascii?Q?yyl5D3DT365T+h/68F55RnXuZffDmOI7J0JMDDyBoixDBNKMx4nnp8fi6+ry?= =?us-ascii?Q?Fq+BHrMiZ2chCD1VF4G3+rAX5K/HYU2EuTFDVmTmh18x1VvQNN3VKfs8aLRZ?= =?us-ascii?Q?BX0U8UeOn7iR6zKLA6Ml8xf0PjQ54f5/awNAxhB8xADf7qblvmVVIFT/yA6h?= =?us-ascii?Q?mQrRQB+p1XI3KhQYV2XgGex5whfElTaT3EPotAj9h2HzdInb4TyV+u46gYmc?= =?us-ascii?Q?mVZzFZLesjadNnYpsMvPrzSWxtIMAgzhlIKZ3w=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?zKMVbw4pI31sBEvXJuFaTgzNDj3LDkVYX0t80VzdMWg4EgLbvguVYQUstkEf?= =?us-ascii?Q?M1s/W313Dfeby4uGO+HJhPTZXyOWBSBJMUeS2gj8e0il+uifaIM5zcFilIRx?= =?us-ascii?Q?1NZHVDxU878nySmliGnI4p4KltKvVXiKUwnl3a1D2qCtIHjnXauyTLAg+/qP?= =?us-ascii?Q?DGgiaT3XVnQDSq2fHn76PDeUR0EillBw7Qln1K6SHBU+0a7KPT8D5cSZe+C1?= =?us-ascii?Q?2MASHAaQCsjSU37tEwbXMKaXMApkDESMjOWCN6/zRQRMh4cieZmupC3Anp7w?= =?us-ascii?Q?8f+529OxCXu0dIQkb1VmNKFj6LNnJckk0Xl9euQmxyf7YUWC6VbTVTE1rM/O?= =?us-ascii?Q?8SN5WlpV9Jilho3mZuaF9UoXWnIDwvlbSHbVrYelA+bc+tin37ITcJYhBUPe?= =?us-ascii?Q?Z7d77Nogz6jiWxUP0cLAIrK6h7MoTtJck8Wz0PnOqbFeESbv/qkG6A2SFhVH?= =?us-ascii?Q?GIMxYdvIDaxEDmks/FM/W7Dc1U6PjP8m6c+MhFOD5TlSm32hbcwx2CBakyvb?= =?us-ascii?Q?yS4Z9FGrKfa3sLRnMMZgcwjdyKBeiETL8UsRw+Pf3f1rBxn6G1aGigoZQwON?= =?us-ascii?Q?AETc438zUEsQwTZGuaZiuv+jBneWsbYQfPOwCfQJO25Od/DnnphyyYQYdEGu?= =?us-ascii?Q?o08WlwNNFU2kjpDgX7A6LhHwFXNuMwb98FBdYlwE0CSbAyk50rG+JS4/b0g9?= =?us-ascii?Q?KnMpT1tIolbiPpDhIisgjJ49AZSidS0L7iqyYECpeQPsnoKw0Cc7aYk56udn?= =?us-ascii?Q?4FqMyfO32Mq3zwQrwd9hkDcFJyqTpMly0io9g7CxOD4sVQaMQogZmfTcfsjG?= =?us-ascii?Q?3bAZOhJxp2xaTclAP2pX5hOla5crMZgjEise6/DV37pe9I8NB/e+0OTWyPqV?= =?us-ascii?Q?Xbk0uYJoKaWUCcVgTQm3zuB4vBN+cIefdeXG/aiXIOAvAd8vXvGqqhsb3bzM?= =?us-ascii?Q?RXCQPULEue8JzHqAXFuOPW5Gy08erFG/NqByt1EJhYsGQM3zBwV8hwlUueuX?= =?us-ascii?Q?r/Uibjk6nJ43ZGSucDtJpx1Q1HzoNFJpHwkou3pueCHuajeU0mszDb6VMafd?= =?us-ascii?Q?WhNqRWcEwYtL4GrtbBvj3w+4qrbo7T8eM8i1CpVye9fcWVSlT7YmWN8T8bOI?= =?us-ascii?Q?y2ADcvm9NSt6QuvS1NUJgwQIQoARcMani0RJ12Yu2m8Wv6zNbL7/LTst0r33?= =?us-ascii?Q?JeJcabxqqaUx6E3UAfDKfmAQ9k/GBMYKbU11EOPmHSnU1/Ck0+TAgZRZBYQ?= =?us-ascii?Q?=3D?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-8534-20-msonline-outlook-c7cf3.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: f4d0bc92-569a-4d7d-16bc-08dd992189d3 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2025 11:12:28.1533 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8P223MB0192 Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> Archived-At: <https://master.gitmailbox.com/ffmpegdev/DM8P223MB0365E2113266E9E6EE55E325BA99A@DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM/> List-Archive: <https://master.gitmailbox.com/ffmpegdev/> List-Post: <mailto:ffmpegdev@gitmailbox.com> > -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Andreas > Rheinhardt > Sent: Donnerstag, 22. Mai 2025 12:42 > To: ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make > inclusion-guard check EOL-agnostic > > softworkz: > > From: softworkz <softworkz@hotmail.com> > > > > ..to make it work when checked out with autocrlf=on, > > which is Git default on Windows. > > > > Signed-off-by: softworkz <softworkz@hotmail.com> > > --- > > tests/fate/source-check.sh | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh > > index 4d7e175784..99e869e869 100755 > > --- a/tests/fate/source-check.sh > > +++ b/tests/fate/source-check.sh > > @@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do > > -e 's/_vaf_/_/' \ > > | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`" > > > > - git grep -L "^#define $macro$" $f > > + git grep -L "^#define $macro\>" $f > > This makes the test less strict. Yea, that's correct, but does that defeat the intention of the test? It might allow whitespace at the end of the but this is something that can happen for any line in any file, not just the guard definitions in header files. Eventually this is guarded against by the hooks of the Git repo when pushing. It might also allow more text after some whitespace, but that would file compilation, I think. Do you know some regex Kung-Fu to ignore EOL and still use an end marker? I had found a way but that requires switching to Perl matching (-E), but from what I've read, we cannot assume this to be available on all platforms. > Why don't we instead just specify that > the repo should be checked out with lf only? Would this break something? >From my experience it can cause a lot of trouble. The following discussions from last year may give you an idea of these pitfalls, even though not everything might apply to FFmpeg: https://github.com/ffmpeginteropx/FFmpegInteropX/pull/433 https://github.com/ffmpeginteropx/FFmpegInteropX/pull/431 https://github.com/ffmpeginteropx/FFmpegInteropX/pull/430 The risk is that it causes more trouble than the problems it might solve. What stands on the other side is that these two patches is all that is needed to successfully run FATE tests on Windows. When a new subtitle test is added, the entry in .gitattributes may be forgotten, but with the new CI builds on Windows it would also be discovered immediately. Thanks a lot for looking at this, sw _______________________________________________ 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".