From patchwork Sun Dec 15 21:50:00 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: 16806 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 969C244A422 for ; Sun, 15 Dec 2019 23:55:46 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7745C68A16A; Sun, 15 Dec 2019 23:55:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF594687F31 for ; Sun, 15 Dec 2019 23:55:39 +0200 (EET) Received: by mail-lj1-f173.google.com with SMTP id h23so4574631ljc.8 for ; Sun, 15 Dec 2019 13:55:39 -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=ZOorU7lTQDZwKXagolAgg0fUm7BJizMZiQm5Slkz38Q=; b=WdxEz/FtnzMW94IPLJtmyu3cVlMDeF2C+1aun9mY8w1NBcQ13d+xNQGmW8DEw2fAzQ 1/q8bfzmCWCWHN11X08ovlyP9T3Q0YuXI0RiG8vfzYESTFIsiCZbPGyTmHYBdkgQ1wLV AOkAilHoQ13qsSzfOFFD725j1FpfzgbKHxZObM+4wJAf077UG3bcbu1RHDCann2LnDBe 2vG/8I6v5uF6JmUqLH0lZgVgNybLAGOvK18XH7UbPhMFAXTkApeBS7Ea3mH+a71pwTB5 RFnj3iJwxrUsbvHm6kRXDzchAqKP8sFnyBzb0y8wbh+Lb8s7OZbd3EmkcKRNuuM2/L9S 0TIw== 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=ZOorU7lTQDZwKXagolAgg0fUm7BJizMZiQm5Slkz38Q=; b=jn4B/5YGqtOzz9d8Lt1Vkt2KWTJ5GujTadG8vNSPoJg+XqB2TnuN5M8uJdUOP1y3ID BLxBoM+JXCRvcJEZIBK1xKPnxl+2g4Qzfz2XE3ndyXpl3qL20UbyIqZb9QlPCjf3vTYB LI5/5fjBF1gj4rTqWA4/nFLEONn07W8dBF7jxwueQYxLk/csBj3tTACEod1PB8ODQxz6 XHNa6R2gTo79GMGVbBP2CqNTDnAwcHp+IPxeZm7hFlb/cdIhc20CxrXHIHOzACUZtQg8 HTlBRA0yDTHkBEwZq92H3qZjHho+kFmNQlBsVaSTvh16jeukvXnDqA9iGjsIZjZFcPG5 ciyg== X-Gm-Message-State: APjAAAUUzG3JylIrOwo0YqqQ0o2lexCaVSazDqg7PAR2WKPFpAAS39ew //UCabcypZDwJChBgYX8GUMC4nkeC4I= X-Google-Smtp-Source: APXvYqxVD7PtR9a4Q3jO3t31iJwjwkG4bueII8j7/LqcuZTxab+tAchAFmUfQ5Y5SVlPpscIrSffsQ== X-Received: by 2002:a2e:2e14:: with SMTP id u20mr17919418lju.120.1576446601647; Sun, 15 Dec 2019 13:50:01 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id b190sm7678848lfd.39.2019.12.15.13.50.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2019 13:50:00 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Dec 2019 23:50:00 +0200 Message-Id: <20191215215000.22115-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCHv3] 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. --- Made it possible to override the setting when running make, by setting LARGE_TESTS. The solution looks a bit different from what I mentioned before as it didn't really work just like I guessed. --- configure | 16 ++++++++++++++++ tests/fate/seek.mak | 3 ++- tests/fate/vcodec.mak | 5 +++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 10c494e2a0..44f464c999 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 @@ -3726,6 +3728,7 @@ enable asm enable debug enable doc enable faan faandct faanidct +enable large_tests enable optimizations enable runtime_cpudetect enable safe_bitstream_reader @@ -7492,6 +7495,19 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \ $CONFIG_EXTRA \ $ALL_COMPONENTS \ + +cat >> ffbuild/config.mak <> $TMPH echo "endif # FFMPEG_CONFIG_MAK" >> ffbuild/config.mak 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 \