From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id EB4A34BD1C for ; Thu, 22 May 2025 11:20:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 35B5968D74A; Thu, 22 May 2025 14:20:45 +0300 (EEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12olkn2086.outbound.protection.outlook.com [40.92.22.86]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 3566D68D29B for ; Thu, 22 May 2025 14:20:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=fRZQTnhW4nn3CAfrnJ3oJzeQ7HHDEQpQsAJse7xe8jH/KsrdSKvq/WKN4EB/i5wHvthXFqJ0ASLQeP7C9VrPoQCpUdy8ml/GEU8BNmfTk8OfuctItl+a77OqO6RHnyf0NIUj4ByBkk2eltVT3OvHWmPBqzTAwd5C+MgpvdCpFI28Vr2mEQcAGMgH2eWYkswjAvs01orpqyMyUjW0wV5X0WcYnOKReiIk2xBhkUeMzUrXNeJuZqcRixtF3ziGoCdFg2qYtEIsmZIZXzAQnHzfuKtRXNpEqwt0D+xeMBI6tWdCe5hbkTyW5Wp308EaaWSBm+/aZiulqGo6X1X86bBQ2g== 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=dCGG2o6rY58JwZYL1S24hp3v2VK9MRJtlzbcSsb6Xyg=; b=BSSGl4u1C24mZpMiqLPOrT7R2sHR6Q0dfnEPocXR3yTasBLIE7E22qlWEGJzseEB3ODOh2BY5+PtJjq4Fvt+0KFmY7LM8soIqWjh4HglktrR/rIg8iqiI7nb30pFCuYve3E78nwM3x4PdQdQYyyKmH9pVjZrMmuIwjNtu0Kv/2iF1Fte//PQd3Hb8uMgXnMTHBbmlgUmUPxT2/SUQ43G6lu6UCCEzQAn/Ko/THwdbjg9vRmlNaQkxvMgzzkIHBujE0TXL63vIIsYF5rJSpKwXzkpqeqm6hpMzO8OxudxyJ1F55p0huDPZNjAWnU6BGaUyGA00MAVOhYgL6KAJCavGA== 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=dCGG2o6rY58JwZYL1S24hp3v2VK9MRJtlzbcSsb6Xyg=; b=eRbEnHzNtkE8WR4sDRfSbZUCQy8D+tJR0Zaj+tugr8fyu50j/GaTlZcZ7HqEOQ2WP4B3shFm6uFEGQ+06VDhJjnxL7ROBPKjr2MOI4fAQloh6wEgZsHQETOHe6s1wlylqgPMQjyJjNuGngL+jhznsg6BTQMjMkb+aByfl5ShtU6s3rn/LhFVvwQGoAFHUoDvpm0j62PXJqs+jdYJ8pYF1xVfTaOOFDAP1IzVNbe9N1GWlzN4drB+uhZoX4JUfzpqOweyrKt719MaGHtZG1NtIU/XM/jWgXhJyqiFa95OGXB5gu/Z81sMhvrNWhn1VYvuIeD2z+KsDSpqA6Ti8vRSOQ== Received: from DM8P223MB0365.NAMP223.PROD.OUTLOOK.COM (2603:10b6:8:b::20) by DS4PPF7182A6CA6.NAMP223.PROD.OUTLOOK.COM (2603:10b6:f:fc00::aa) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.32; Thu, 22 May 2025 11:20:36 +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:20:36 +0000 From: "softworkz ." To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic Thread-Index: AQHbxBKkDdKbnQxyBECC9Bj6Y37wTLPehA2AgAAApGCAAAk/wA== Date: Thu, 22 May 2025 11:20:35 +0000 Message-ID: References: <73ab2c2be54d092246c42c0e243efedb049165ef.1747146207.git.ffmpegagent@gmail.com> In-Reply-To: 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_|DS4PPF7182A6CA6:EE_ x-ms-office365-filtering-correlation-id: bd24553d-6c12-45ad-8135-08dd9922ac92 x-ms-exchange-slblob-mailprops: YfhX3sd/0TV79KLUZXH6jYsApOyagGvSlcrIuGqKTd7CrR2krulDDJhqWVS0Xs+7gaWY5/s27I0WKg91h5RitHE1LBoLCzoLIU08VqknhOCW1jbTCRuGCBRjpVsTEgm8O/YMr5kaThFrwfyM8BOhZC0yMZVUePZRmMR+Vd2OO2oIgj4n1mpmDhJpHOrmxrJ05KrYlvMXA1xRv9oFzV8+CflDqy5B8NzdmD/7ziqM/xe6aRqIg/f9W77bjbJTka2W5uKafz+tqJxrojk/Tj6cpLgLpulgQJB21Yjem9y2PM3Ie4RP/rPnwxAvdU1RRxHgg/esTM+QLMNscGaG+sHZfjUVcrExl321kwh3PqsSNHopEKdjLC4sRbY4S+nYm7p7PSjwvNiDz83dAMUH3wNBkMVrjjQLOlUeVlnmOJSmer12pqJ3urFiqlznVWPVFUPsyZwkps/NmgwiQay1HTN0wiu2+JU39QT2M2QSqPoWw0MYNioZqyMrbr8CqXihRDCr/9aH0n5UJ0ExESrbPG4YN5kJWbqmhQG+UDmtwvBY6r54P+CCartuouJPEv4zNb05z+fUaQtQz3OqLQ5ivkM9+IiSX0EJerW1/UchN+L3COKNPC0FWHixuI+8OMELNHYVGS4GzN1M90cgs6L1xyzWtYnifBFwQ5tu8yZNvzFYeGGMR/FxrtXwhw+vrId87TuWliQWzn+SZy4ZZCReRWQt+NorYnwr2KEjh5JOM5Q/U9LucKXKV+b7cKu1UxCzqW00MpKLbfK2A/4JVb8YxGUlMM+9yIW136UVB+l1cirg/+Q= x-microsoft-antispam: BCL:0; ARA:14566002|461199028|15080799009|7092599006|8060799009|8062599006|19110799006|3412199025|440099028|10035399007|34005399003|102099032; x-microsoft-antispam-message-info: =?us-ascii?Q?Fvlpr1UA2r3sTtgIPFs4wOvbrajCUc1Jl7n38SNwv0y8tsrZJEBvpSZMCn6O?= =?us-ascii?Q?wOalacK+rwL0n2z8wx9PBUlxyk4k628LC76FMg61PZJq32kX8RwHVBxIz9OU?= =?us-ascii?Q?OfMO4oB/VyMK3Ony9K00d/Bpb/+G+LNg2qp2qPkEeAMSZXdNBuZ3pXCKkmcx?= =?us-ascii?Q?iQl8wjxep6IbNtuTPVDjXuFRa4LwVisqwG2jOfhBHsBq+dkfM+A/mBWgBXY9?= =?us-ascii?Q?X7CUu070ntEMM7RfrK74/bFq+oPJHllByWBCQ7B8TakURH8j9I+eDY6GveCT?= =?us-ascii?Q?8N6Qwt4yvRurMovIdodqSZTLZy7MTZIrn2ICyUgKXvHgDRFlASistQ7ljAw6?= =?us-ascii?Q?XQmEfHTMXnzjVnWUjPC6KGGKHtY2YhW2HAKgPoAbUgj6smNmkqKETIK7WSF6?= =?us-ascii?Q?wK2id1iYXJtEAk2cbCRpoOc99FWrmSJnhf9NaBgVSBjgPKCO6EhB7zqjgN0R?= =?us-ascii?Q?KN74yN56yexDKdHibhCzW/AxH2CIQs2jMLn0FWr19+TXLzgO9i12rDn2H71t?= =?us-ascii?Q?7OuofEDvkz/SCFSaNcEj7k4TvWcUWLHGW+UfL0oMzRmcbEIeSqJ6Fiaq6vFD?= =?us-ascii?Q?Acngsa9xcdSaCjJTI+4W2ao7S0rMDQwfp9ywF3W8AspkSGI6QXAw+51ano7I?= =?us-ascii?Q?q3WxeMcB0HQgdCkMpMngo2sP85KqZP7qaQi0liM7F9+YYlllIsvPj8VRsIAj?= =?us-ascii?Q?odT3pyJmU3f6KSZUjNElt5gbeBY+R5oR184I3eMznoOY8pz8cLAa+bgZ3ZtA?= =?us-ascii?Q?xpZ8tPFrDRWQWX4J+vRm0re5tH53aHv1i9OwPFypgFe3iOqqsMvCrfSfcMLD?= =?us-ascii?Q?BShPDPXZe++Ot3W5xsASISQWYqM//XIfg/KpCOdVRZ9nioQ7AwT3FsIhond5?= =?us-ascii?Q?Eoi545x7RJTPu0W2bqbMbSCgWocz1R5QfKEe4pSGQtGELcPaGaP3q9Nm8ERf?= =?us-ascii?Q?hW/QVG0vq7+y4H42z63Z871z71aoTJNuZi+gsO7WENrkOxZeYBtR0YQTJgXl?= =?us-ascii?Q?t+f95Korkz9peQdoKmJgZ9zb8XlBfq+QjgduErz62BLudEL96uoRQVyoTH8Y?= =?us-ascii?Q?+ou8ggKcMlpQbqzkeqvCCMaZUQTG84ztxYx4EFdILsVPB/zqCrQPjx+ozL0X?= =?us-ascii?Q?SyOn13UGZ5ACocM906yuUGBTKi5jOlK2qC5/IIVNH6N3+Mu9QmXJ2LuaGxku?= =?us-ascii?Q?REmp9bo1uRQPnkfbKbN51YqDTHupHc2Y9TnGrw=3D=3D?= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?rrZEFaUC7AiyPj269WndlmQlzv/ZL911Ek/uiR86mVbWla6VY+lGhxDV5Pcr?= =?us-ascii?Q?MiGX9EAK3Y5PkEL+wQ2keUJSLeC4p7W4I1LcleKplHfFghdtEbKx1s9N1cV/?= =?us-ascii?Q?9zsLGi4MbMemh3rUFc/8fCkCdfmfqomJi8Hsi4FzQsu0fmClKKzg4FiMatRz?= =?us-ascii?Q?qFlqMimGlRYUvUsmugEcHAWg6pDgbT+CIazhHc3Cmj85fcdP3dkVbWyCPNhz?= =?us-ascii?Q?SIAGqzXAFkF79LZXlZsz1AXsZGCU/EvDVw9boekP6cfxfPoOdjWd66fnAosb?= =?us-ascii?Q?1ixLFXRWlyDiW9TZYPnM05W1ZBUS85t1dJjTH/+0sPLdJxFt2rqBNHi5DXAI?= =?us-ascii?Q?DsuEEtCUJmg2GzCwqtWSNE0a1qpZIJ+mSyIWKT74EMJqTx5EbJgR2FYh1bxy?= =?us-ascii?Q?LnZ5TNRZWprkTdt7fxoICNaxpQJwAC9942fzlF9s8pbrs0GV2SEWew4qqBEc?= =?us-ascii?Q?f88zdarWryimQIYX2Kiy8vtBNZSJuSW0jGU/192lmCeizGtJDRV8ItgWI3BZ?= =?us-ascii?Q?oP1XWIx/xqJCOKqxaIYJD0vLh0eAPPXT0YF2hmrf2tE/S1cU70vzYaifxnfx?= =?us-ascii?Q?EpSP0ktCtzdER6rEa5128v+R6x0CtY76T4Cn/UUiyk281h+NHWHk5hVnqnnn?= =?us-ascii?Q?QVeajEmCduulgn/Otw5JHm50OSt390oZpu1YYmRRkKFLK+bdIFnKegOz1/Ur?= =?us-ascii?Q?YrOj+bqDY+Wuh3mgmSmS/MZSclKFZl7rsEyZp5HeVDZcil3lnj/axMyNcUn8?= =?us-ascii?Q?jlPWTU9YielsIsRWwKxeriFwryJvUe/q5CFbqBQkIvu1qtZ7IyoUanRHcR8F?= =?us-ascii?Q?mroEYpz6L1G7zsHUdCN1ioWK4qs1YiIRPw1MEm5KczH7GPjoXLcEoUt0K1+f?= =?us-ascii?Q?7P2C9YMe3HWR4R51Velmxn4mgn0HmRifUGTqcQlRE+LH1RsxXuffw0SBAN4b?= =?us-ascii?Q?xwZKyXvBKFzaaz1pGGtz7XJntNbj0ZLOlsKAI8TXssKcCYiEYAKDM5OuidMC?= =?us-ascii?Q?tYOkzwW4VaLBc60IywDiF5/TCZ/TI7LBA9Icm9FsYLQSCnWjwgGnTmIkFvlY?= =?us-ascii?Q?Vzw9XQuLN873MZnLENMgE+Po661zGNwjU73wXjPCmYBTbALi+LL4Le7qdwk+?= =?us-ascii?Q?F1wMrKLIcZ/BfpIPY7ICSKt85hVLMOxYp6wyzsBnwyZzvxwJrUgOoMcoIV/A?= =?us-ascii?Q?vs9yisJkqDTwS7gyIu4q49UMxZdPy85QX/ihKNzdz/4fhQ8eG9OjeF89W0k?= =?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: bd24553d-6c12-45ad-8135-08dd9922ac92 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 May 2025 11:20:35.9618 (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: DS4PPF7182A6CA6 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > -----Original Message----- > From: ffmpeg-devel On Behalf Of softworkz . > Sent: Donnerstag, 22. Mai 2025 13:12 > To: FFmpeg development discussions and patches > Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make > inclusion-guard check EOL-agnostic > > > > > -----Original Message----- > > From: ffmpeg-devel 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 > > > > > > ..to make it work when checked out with autocrlf=on, > > > which is Git default on Windows. > > > > > > Signed-off-by: softworkz > > > --- > > > 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. > _______________________________________________ Oh, and I totally forgot this: There are other tests which are failing when declaring EOL=LF in .gitattributes - even a few subtitle tests, that's why I haven't added all of them. 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".