From patchwork Wed Dec 11 08:39:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 16721 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 097A744AFBA for ; Wed, 11 Dec 2019 10:39:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75FCC68AE27; Wed, 11 Dec 2019 10:39:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0994F68AE27 for ; Wed, 11 Dec 2019 10:39:21 +0200 (EET) Received: by mail-lf1-f46.google.com with SMTP id n25so16054329lfl.0 for ; Wed, 11 Dec 2019 00:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=/KbeTLmKgHqhsJBuZ86HRQUk/Ov2qxwG9UhFFY2iogA=; b=iZQYhVP+rdtZds43+iVipywf+58sIFl6SeVzBtQjjcfJWh/ixrOrBfR2FRS9dhLTqw RqQnmt9tIke+ALPsO2w7qPfh//IvJc7Y/jMPx9k5q/aAKjNtKPFc+w37DsKhJjQqByeE LnEJhss/nWHx7UzC2jK5VhoUftwZUubeJVOAwpHt9GGh5MgSBkNZYxlc0ErAeoGUulra 7bmam3ZovlNfnmcHDCg59yvHJ/1rCKu3FfVEEoF6ekZETwc3YIGeT+bvIaeXrCAmg+AT /YiVUjWFP9XRWpPBVyY50D0IjR6m7EFfMmIgFNhASunkQFpxVKZmxYdNf49RstFydf9q f+GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/KbeTLmKgHqhsJBuZ86HRQUk/Ov2qxwG9UhFFY2iogA=; b=BaKyXCysFYcfaoicb+UtNN47531P0uP7rMq4yqcvL+Lahxf8aUQhllEpF3c3UwtowX UtVb3iXpc1MRwiATDA/1jqvPjaYNsaP5XoFotYzrOr6UK9wRoz3h42+YFb6rDf8yxhvM vuKQfKA3Y/PArLiNqQEdTzP3EOKded3ByuQKL+PyuA3jfxWME+8r9sJ8726RpEYVV75H W/Y7IvRaCXBIOGENlxJ6Me3mxTlraaG4XawnlbbZWjX9+zztQvCqGlLbi4yc8WhgmZ04 Bte61jRV9FhW4ZC2SwDjKi/Jh/Q+VJXqc4XzftyByu0+nVjy+MgfTKPukJzQyIx8oqhh jsjg== X-Gm-Message-State: APjAAAUEzU0GrvfTU+SSfF6RKzsJDctoKbVP5LF3hb197o69XvShFCcX hkvQva7oexJq+UQ+c+bOUsjo9S+HqVw= X-Google-Smtp-Source: APXvYqwvIp+Qkj5bGSDW8YWtGJTEE95aOJdGNfcp1M/ex81N+xj6bXmeQFyByRcIjMUZMJVsZGT/yg== X-Received: by 2002:ac2:485c:: with SMTP id 28mr1392307lfy.118.1576053560092; Wed, 11 Dec 2019 00:39:20 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id g5sm728948lfc.11.2019.12.11.00.39.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2019 00:39:19 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Dec 2019 10:39:19 +0200 Message-Id: <20191211083919.15394-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 In-Reply-To: <6c75544b-1229-be37-5041-77a5485fe904@gmail.com> References: <6c75544b-1229-be37-5041-77a5485fe904@gmail.com> Subject: [FFmpeg-devel] [PATCHv2] fate: Add an option for disabling the 2k/4k tests 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" When testing on a memory limited system, these tests consume a significant amount of memory and can often fail if testing by running multiple processes in parallel. --- Adjusted to use ALLYES instead of a -yes-yes construct. Also moved the 2k tests to the same option. --- configure | 3 +++ tests/fate/seek.mak | 3 ++- tests/fate/vcodec.mak | 5 +++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index ca7137f341..922cd8d0ee 100755 --- a/configure +++ b/configure @@ -482,6 +482,7 @@ Developer options (useful when working on FFmpeg itself): --ignore-tests=TESTS comma-separated list (without "fate-" prefix in the name) of tests whose result is ignored --enable-linux-perf enable Linux Performance Monitor API + --disable-large-tests disable tests that use a large amount of memory NOTE: Object files are built at the place where configure is launched. EOF @@ -1931,6 +1932,7 @@ CONFIG_LIST=" $SUBSYSTEM_LIST autodetect fontconfig + large_tests linux_perf memory_poisoning neon_clobber_test @@ -3724,6 +3726,7 @@ enable asm enable debug enable doc enable faan faandct faanidct +enable large_tests enable optimizations enable runtime_cpudetect enable safe_bitstream_reader diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index 04f54ee6c4..98d2b54674 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -64,7 +64,6 @@ FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV1, AVI) += asv1 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2, AVI) += asv2 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p-rd -FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-4k-hr-lb FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv-411 @@ -80,6 +79,8 @@ FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, JPEGLS, AVI) += jpegls FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG, AVI) += mjpeg +FATE_SEEK_VSYNTH_LENA-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb + FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ mpeg1 \ mpeg1b diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 452246689e..fc27da5456 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -29,13 +29,14 @@ FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p \ dnxhd-720p-rd \ dnxhd-720p-10bit \ dnxhd-720p-hr-lb \ - dnxhd-4k-hr-lb \ dnxhd-uhd-hr-sq \ - dnxhd-2k-hr-hq \ dnxhd-edge1-hr \ dnxhd-edge2-hr \ dnxhd-edge3-hr +FATE_VCODEC-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb \ + dnxhd-2k-hr-hq + FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \ vc2-422p vc2-422p10 vc2-422p12 \ vc2-444p vc2-444p10 vc2-444p12 \