[FFmpeg-devel] [PATCH] fate: Add an option for disabling the 4k tests
James Almer
jamrial at gmail.com
Wed Dec 11 00:53:17 EET 2019
On 12/10/2019 7:46 PM, Michael Niedermayer wrote:
> On Tue, Dec 10, 2019 at 10:12:24PM +0200, Martin Storsjö wrote:
>> 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)
>
> The yes-yes looks a bit ugly, cant that be avoided ?
The call ENCDEC could be replaced with call ALLYES. That way you can add
any CONFIG_ variable to it.
> either way LGTM
>
> thanks
>
> [...]
>
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".
>
More information about the ffmpeg-devel
mailing list