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 6C6C84259A for ; Sun, 24 Apr 2022 03:39:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B104168B4DB; Sun, 24 Apr 2022 06:35:48 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074074.outbound.protection.outlook.com [40.92.74.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F2AD68B4B4 for ; Sun, 24 Apr 2022 06:35:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xbyn4ogu3IDQoZMCyEjh6avXrhEszkpwFgtP7w8OxkPsLlUh6TR8o2c1lSKcvsab24VNCbrUK8YY78P0GidrquvgprYh2Bo3cGnN7/kjeWCgdy7Zv0gD6VwPtAMnG/WRj6cte/+XatxTOvOzch7pwBmoQwKuVNG4MyTKQXgRrxgaD2zcK7JDH2G2aQLBQM59y1OTFRmiSRxfgtsZExdHUY5Bgl0UrkMPOOxtSg147OLbFKSigvVGF2KNkVnrRYJ/Iet+08OpxLyFBGXu4ugwkmCUMIQJPFbRQJBj9vIDz7YhCEYwO4x9NXvKhySwvf9C0FIBdO09FGUCV9PsaUsomg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=l7jQ1VGH/Whwuw7fc4NL2yemkFnpzFO6rhX1HxtXfQs=; b=oKY6QaW6mcNeXXhSq9b+5v3hR1M1V0cxrMXmAWd5bDRO2FSw/9Cquel7d/Kc13cmWfOO8n+gbHogobIKYcYsx7XMPwGOlis3hi1m++SBZsKAMfMH6/qHqOwI9B0IBb+hZEPtcB11JrpV/8H4j/wVVgCuei3e2N48PSNt4nB5h2mxrFL+VmzCaI4VxMsPfD1cUwkunnjptk8pG1p/hU7b12zOZv7rzWoBQbVy6srLp0RlM2/fd6DqSnhItzrCXF+nG5ue7wzZvlp+sdtJzG2TE+873Uow3hjhxITYIO81EPnaM3xD32i1MieRJDpfEAYRQcfo+8LuRnQDPx5ZpKqDig== 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=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l7jQ1VGH/Whwuw7fc4NL2yemkFnpzFO6rhX1HxtXfQs=; b=q+GeTSC8PQoZi169SzAcfQyT6vnAGCDy1IZsThQQlrqzj3Kf6y76UWbjt7JmWIrbiL2L5lbcq2suqX3trhcA7IM0u9K+90pwsXll+mkclDmnHRnNDBSi6nlMn3W0KpXAgVM+9jQY5qRy27gdWfUGRzPQQBN4RhiBqIDi7hL6BpLzfYP4ZO+8uM33bJ/vYXpLOZfLhcNUY9Em3UYIyXfWH2WqUuNybOrgyWyfF3vY8qS3s2pMTdp1v30sYtqQ/hwyVQ6XbIMNzqGxqS2GliKVP/DlaKHdnjZx6yP3lF2LyQQK0RCsAL2llLp6R1RqfVN8PDsomHXZYUEU4sjQ55Jtng== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by VE1PR01MB5534.eurprd01.prod.exchangelabs.com (2603:10a6:803:11e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.16; Sun, 24 Apr 2022 03:35:40 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5186.020; Sun, 24 Apr 2022 03:35:40 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Apr 2022 05:34:17 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [x4FI1ZOd6+6oUZkuw8djaEcSzS1mPGrQ] X-ClientProxiedBy: ZR0P278CA0118.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::15) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220424033417.797645-31-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecff133f-7566-45de-cb3c-08da25a38133 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT4+P6zBac8z1eXEhCqSjjDlWwEjPkjbvKJ6URJLO522E3DQ4X82pGKmjqOxMnzNBHJ8PvgPTSgerFcbLBzGBeNL1lSnYFmV8jxzmk/ylcRM3/oTFP/zeFyc1b3/iFlGOO1PYAzMMqUoQc9mbNvrPlPKwBA/SnELdCxbyhNFW4zCtLltR0iutLltma8Xc8YRzD0Y5VFiyD7My56G+4e3rfDhCIs19aQuPrbwlR4sIuTEjg+mJvCKuoSeij932TgoqIhVWr+Mp2tOsmJExPphiPe6OrtAEv8GCRHqaER/9U1K78PIakgRMIhbbRG4H61actYyptcVtGV+P138triHg3DhW/n1TINpzQTuIIp9VCkSGHVjkisXOERlfG89RNSzjbLL6QP9Zo30UFE/HfydEBvV9ac9XeZ6Z+Djr5Mw8jYwHFsmT9mEvAhPqrzU7YhUKhteyYAkdstS0oDzrBul52/plVjUXJ9TSzd2AfOYwUiGjphCJ5343eVH5oEupiLRJQmEh6c5jyGU5LFJ5YmZvvq2eFVxFcWexWEbjph/uqcn2gEi8/0DCkuTw27Rkdj/UvIp21u+Z9kBmHe4An0U24ui2mcM5FnCdfHG/1kvM2xVDTxsICk4tyz7L+Ry/kWlUyAT5xzvooThryb7gxMRuX3jMl5gK+IsLkuLRBKG8quT0yUejeClNHGcPwK/G7MRF/31LBcZvYFl43BxvgmJJTPrtJy64OnAG4czEcgC+U0IzuIQwc/vqzVVaseCwpS+hY= X-MS-TrafficTypeDiagnostic: VE1PR01MB5534:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9wgZMLiLB/WeZSHOETpDoHpDl3o7ssnOCQMEP26oGS7LpxsVJuxLiGpdLwVs0HAqLLGWamxGYFbWCklFYkSq+bmzljgmR5gm3N+J3/ba6hvDUB+FI6XDLK0syZAGqs7ltzFdUX3W98/y0RVjueP6e8FYmgEN3CNIQE0cxIRG21j8uegaVhtBGci+wbtH/tkzn6S9jOnZg37elwDqiscqlYQxoeDZtU8Atbb5q7xDrERFkS5y2IKL5YRwTixwKWZKmCragiPCtzOptAwH01rqg+3ApF5PJ+JYlCyZriYfwsTpX462z2pFudURM+X7ByuSIrI1YkLLv2/C6BfwQsWAWzXigJWwTqHn+0QvJquJNJtsXHIggWDXO26+DqN3VpCfLLsBTkeZgfrQ6od6SjThXX4Euc92r4CmI4nvKsjryYWuTJ+IoOS2kPCAhKf7+hNLSYODE7JbfoEGnPwI2B88cfv+mnSwtMsA/WOiUqiP0r5GLgmcd/uki4ixpDDFtwtdiOKtMzLMlfmnYwwheMj1kfKcExfw6ZwB8nIKjkskXsvj/3eajGHP+QK3H/feDWMd4xx4XT6XCX/cn+lKTzCl3w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rbB1LuWqlN1G9xUdQqF1xHtt77mU/a3d5uPK3nVBGZm4C1YqRaYdoVSUgBhE?= =?us-ascii?Q?UmGC+qZeH8Nw7eNWlvuwDUJhey2GEwBwziL78jL+UFPABiLsKAdPPSZHw9qw?= =?us-ascii?Q?Z+t8OSChsnCjWchQNs369G4AKkqVOsmGFWcKDmtzKCN1TSJKqBYKtbAA+h8B?= =?us-ascii?Q?idHyWIEWMfmUtvfux7mk06WoADNaP6BdrPLUNejiVXzfNYQztT3wG/+6nP9+?= =?us-ascii?Q?jKo1vxAHm30l7HArkuZuRK70iGLnM35CZkwyzPU8bPhtsHioKX34LgYU8XHX?= =?us-ascii?Q?idtvLYd4cDXOlKmTIZtexbTTAMdhijtbvOKIaDtbFpMwtOGBVAeq6F539rQa?= =?us-ascii?Q?spx/3VByTzDQzpEpNdPVpAsRWabDlsEo8p+PtjskFFgQgGHuO77enuky061R?= =?us-ascii?Q?Ha5K1pzPZVGhPG0BzBITqq4gWqYskYpy3q+lIzzWTg4IUE3HHtSYV5DhgaP0?= =?us-ascii?Q?OBjJp4c9FgE0Dlj9QY4KNmr2TEPGhAidAZnS8A7SxLxwa4Z+HdNF1iUHmQrq?= =?us-ascii?Q?r3vAdsYty3v5orxhAYvLGbJt6KM57fQPCEZVhHfKUO0QfCNDl3OwzuNwmIm0?= =?us-ascii?Q?YZxX79VfqveOpdNq+ZhnJ7MpydZjpVJwNOrFr7LE6jRVxMtUAcCfT1DvfsEo?= =?us-ascii?Q?Dg0HhbY+tMGY6mR7sEl2D3hquxdiBRBtgPgMA/KpjN6g00Yq2TX56TNdF3Uf?= =?us-ascii?Q?52q4B2E+FbZJyePxJoePieH03/aKYOwP1wgdjnka2sxnRu4UQrWOtgxzfYxe?= =?us-ascii?Q?wbpnYcAWMnBCKZnglQLEtpc81mwV8LyC9wkJINtlS72zQZoSGf6pJUpOT858?= =?us-ascii?Q?NVHWKbFGXqVJU9Bze3Os0BD0iovuwBn1mBgBDQXA1Z5QnCl+v5rz9a3G6iwF?= =?us-ascii?Q?pXu9FSZmCQiUuL1Y/q4l3jgo9No8Mj320oAVXkGn25Tibpk2ySRL7YUeDc5r?= =?us-ascii?Q?xH56DsRf37X+pvOuSAydb2hYYbTemtGKQfUpZwChS2Sr8YDcfrAm/Nz4cnjB?= =?us-ascii?Q?frAKRtsw7J0dKQE77aqgvZDP/dXRUFWbgGF+DSkWyORMjXo7pSlykdvtr5xp?= =?us-ascii?Q?nclHXIM72qBFi8bvmbm0c8DDrlSvyB9LlNDksDZW2SGK45ZUJbbFx2nJDhG4?= =?us-ascii?Q?lAKoSQCmwlJXaZ3I1n8NFYIeW7Emz9PmaCpT/ZHaX3G6s71/g+Syskh50+QW?= =?us-ascii?Q?P2xVaVwBiniwCNR0rqxYUp2ImriIsloyQ615JplDstFqtLDfcen8ilLb5E4F?= =?us-ascii?Q?K146GOtRSyEpyvV+VQZAu3b6mwUXO86CXxYc1ZZXgTj0ehT9Gmv+GxN2l2wx?= =?us-ascii?Q?Z2CHMXcv2V3p91XKdnYvpqq5MIxMhvqKKC62/xA0nueWoQWRm2uHJcEI34oX?= =?us-ascii?Q?LMbf2TtM2/JqnVA3kcbHN3hXNEmcCQeJDcf8/DGMNRgfy/IQVKvrT4RW1NwS?= =?us-ascii?Q?3RuR8kQkDp4k77odbrxfWDJdIOh8ub5K?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecff133f-7566-45de-cb3c-08da25a38133 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Apr 2022 03:35:40.5773 (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: VE1PR01MB5534 Subject: [FFmpeg-devel] [PATCH 32/32] fate/concatdec: Don't duplicate test requirements 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 Cc: Andreas Rheinhardt 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: The tests in concatdec.mak reuse files created by tests from lavf-container. Therefore these tests have the other tests as prerequisite and mostly duplicate their CONFIG-requirements. (The mxf_d10 tests did it incorrect as they only required the MXF muxer.) This duplication is of course bad as usual, so stop it by using the corresponding variable that contains the non-lavf-container-tests that are enabled to filter out all the concat-tests without a corresponding enabled non-concat test. Signed-off-by: Andreas Rheinhardt --- tests/Makefile | 1 + tests/fate/concatdec.mak | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index e02eb57035..6e8fc5906e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -141,6 +141,7 @@ include $(SRC_PATH)/tests/fate/canopus.mak include $(SRC_PATH)/tests/fate/cbs.mak include $(SRC_PATH)/tests/fate/cdxl.mak include $(SRC_PATH)/tests/fate/checkasm.mak +# Must be included after lavf-container.mak include $(SRC_PATH)/tests/fate/concatdec.mak include $(SRC_PATH)/tests/fate/cover-art.mak include $(SRC_PATH)/tests/fate/dca.mak diff --git a/tests/fate/concatdec.mak b/tests/fate/concatdec.mak index 988559d251..e7d2e9b4b1 100644 --- a/tests/fate/concatdec.mak +++ b/tests/fate/concatdec.mak @@ -1,21 +1,22 @@ -FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf -FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf_d10 +FATE_CONCAT_DEMUXER_SIMPLE1_LAVF := mxf mxf_d10 -FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-$(call ENCDEC2, MPEG2VIDEO, MP2, MPEGTS) += ts +FATE_CONCAT_DEMUXER_SIMPLE2_LAVF := ts -FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf -FATE_CONCAT_DEMUXER_EXTENDED_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf_d10 +FATE_CONCAT_DEMUXER_EXTENDED_LAVF := mxf mxf_d10 -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval fate-concat-demuxer-simple1-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D))) -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes),$(eval fate-concat-demuxer-simple1-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple1.ffconcat ../lavf/lavf.$(D))) -FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF-yes:%=fate-concat-demuxer-simple1-lavf-%) +$(foreach D,SIMPLE1 SIMPLE2 EXTENDED,$(eval FATE_CONCAT_DEMUXER_$(D)_LAVF := $$(filter $$(FATE_LAVF_CONTAINER:fate-lavf-%=%),$$(FATE_CONCAT_DEMUXER_$(D)_LAVF)))) +#FATE_CONCAT_DEMUXER_SIMPLE1_LAVF := $(filter $(FATE_LAVF_CONTAINER:fate-lavf-%=%),$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF)) -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D))) -$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes),$(eval fate-concat-demuxer-simple2-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple2.ffconcat ../lavf/lavf.$(D))) -FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF-yes:%=fate-concat-demuxer-simple2-lavf-%) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF),$(eval fate-concat-demuxer-simple1-lavf-$(D): fate-lavf-$(D))) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF),$(eval fate-concat-demuxer-simple1-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple1.ffconcat ../lavf/lavf.$(D))) +FATE_CONCAT_DEMUXER += $(FATE_CONCAT_DEMUXER_SIMPLE1_LAVF:%=fate-concat-demuxer-simple1-lavf-%) -$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): ffprobe$(PROGSSUF)$(EXESUF) fate-lavf-$(D))) -$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes),$(eval fate-concat-demuxer-extended-lavf-$(D): CMD = concat $(SRC_PATH)/tests/extended.ffconcat ../lavf/lavf.$(D) md5)) -FATE_CONCAT_DEMUXER-$(CONFIG_CONCAT_DEMUXER) += $(FATE_CONCAT_DEMUXER_EXTENDED_LAVF-yes:%=fate-concat-demuxer-extended-lavf-%) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF),$(eval fate-concat-demuxer-simple2-lavf-$(D): fate-lavf-$(D))) +$(foreach D,$(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF),$(eval fate-concat-demuxer-simple2-lavf-$(D): CMD = concat $(SRC_PATH)/tests/simple2.ffconcat ../lavf/lavf.$(D))) +FATE_CONCAT_DEMUXER += $(FATE_CONCAT_DEMUXER_SIMPLE2_LAVF:%=fate-concat-demuxer-simple2-lavf-%) -FATE-$(CONFIG_FFPROBE) += $(FATE_CONCAT_DEMUXER-yes) +$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF),$(eval fate-concat-demuxer-extended-lavf-$(D): fate-lavf-$(D))) +$(foreach D,$(FATE_CONCAT_DEMUXER_EXTENDED_LAVF),$(eval fate-concat-demuxer-extended-lavf-$(D): CMD = concat $(SRC_PATH)/tests/extended.ffconcat ../lavf/lavf.$(D) md5)) +FATE_CONCAT_DEMUXER += $(FATE_CONCAT_DEMUXER_EXTENDED_LAVF:%=fate-concat-demuxer-extended-lavf-%) + +FATE_FFPROBE += $(FATE_CONCAT_DEMUXER) -- 2.32.0 _______________________________________________ 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".