From patchwork Tue Dec 10 20:12:24 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: 16702 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 21553447700 for ; Tue, 10 Dec 2019 22:12:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 09D5A68ADBD; Tue, 10 Dec 2019 22:12:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3093C68A71D for ; Tue, 10 Dec 2019 22:12:26 +0200 (EET) Received: by mail-lj1-f175.google.com with SMTP id s22so21333891ljs.7 for ; Tue, 10 Dec 2019 12:12:26 -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; bh=B/P/Hjvh5XDIMMWsi4vWYQDOxP2X1wxyIqRsaYk8rV0=; b=VU91v8tuoRzm4+qKY8O6Q9DgTc/+8brCz+5/i/I/k3NbFMXej1LSNu05TByMlWyfs7 gI5Hehk/wDv0we7fxww2eTRLBH8zWmWrpH0414ccdmgrCdunu6489TrD7qER2KQDABRE wmHiAewzgC81WGm+ti/0RX5wC3bAXUciU7xc7fG42UnT8hZKk+r9zNAaFCdQmmr0CwCg xRRt2NE5tfSu8MQjrUEVJX6WCwYe0kXeNiHF4j1VLmVLxNApvtjZfR8ZKq0LTnlYtKZT f43/q4XjhQCZjiFiZA21G9QchfLah3YdRLdmKjasj7Hag8JjBRfew5gldrxOGVeMT9mP vHnQ== 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; bh=B/P/Hjvh5XDIMMWsi4vWYQDOxP2X1wxyIqRsaYk8rV0=; b=DB7qJj99QQs0nCxE+0+ih0nXZ5Pf/FNzBIlj6GADnwF0TcE3/EGr3DTMFhtYXixHhG KDRshMF5BAGsY/cKAKUv0Nfk5yoyw/tqLuslD4pewIRp19AlVFPQrE1wIQJxND9zdPzo AILMr5mRb/7JLMQkkn7H9t9rKVHRh+kFSl5IkWQmqFKOF+gxtC8wBxe/R961L/pjpilo S260eftmSBSWhcdE5DumaD1WF8dwuXLTQo05FpSlR5CEIZa2PyKHlbgu1+snLhnR9TH8 ZChcOhAvvHys8feptLeHYbnIgKcrAMQkEqCWZYN+vsr5o4FvgsI48DYmpGxaTCBfLs5X dIUw== X-Gm-Message-State: APjAAAX4vAhWJWIqiIErmlPYXiRnSFW3hKEsqdPy9H8TS9QKasmzAmt/ jLb8pOleKIAjtttIUaX+yLWhXuYKcKk= X-Google-Smtp-Source: APXvYqxXNKNLJnKZY8yf0fB4Kq3GZNk4q7nAkgpBCItLxHsYTV23pbpHkIRYECzcVcLKdnx39KDzvA== X-Received: by 2002:a2e:5843:: with SMTP id x3mr21481937ljd.64.1576008745276; Tue, 10 Dec 2019 12:12:25 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id h14sm2167464lfc.2.2019.12.10.12.12.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2019 12:12:24 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Dec 2019 22:12:24 +0200 Message-Id: <20191210201224.22819-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] fate: Add an option for disabling the 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. --- configure | 3 +++ tests/fate/seek.mak | 4 +++- tests/fate/vcodec.mak | 5 +++-- 3 files changed, 9 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..284e9f3ffe 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 ENCDEC, DNXHD, DNXHD)-$(CONFIG_LARGE_TESTS) += dnxhd-4k-hr-lb + FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \ mpeg1 \ mpeg1b @@ -158,6 +159,7 @@ fate-seek-vsynth_lena-wmv2: SRC = fate/vsynth_lena-wmv2.avi fate-seek-vsynth_lena-yuv: SRC = fate/vsynth_lena-yuv.avi FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes:%=fate-seek-vsynth_lena-%) +FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH_LENA-yes-yes:%=fate-seek-vsynth_lena-%) # files from fate-lavf diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 452246689e..a52b93b9c2 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 ENCDEC, DNXHD, DNXHD)-$(CONFIG_LARGE_TESTS) += dnxhd-4k-hr-lb + 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 \ @@ -458,7 +459,7 @@ FATE_VCODEC-$(call ENCDEC, Y41P, AVI) += y41p FATE_VCODEC-$(call ENCDEC, ZLIB, AVI) += zlib -FATE_VCODEC += $(FATE_VCODEC-yes) +FATE_VCODEC += $(FATE_VCODEC-yes) $(FATE_VCODEC-yes-yes) FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%) FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%) FATE_VSYNTH_LENA = $(FATE_VCODEC:%=fate-vsynth_lena-%)