History

fate: Add an option for disabling the 2k/4k tests

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.

Martin Storsjö committed 6 years ago

Commit 0f50be61 parent efefba64 files · +18 −3Browse files

Unified · Split

4 files
  1. configure +3 −0
  2. tests/Makefile +10 −0
  3. tests/fate/seek.mak +2 −1
  4. tests/fate/vcodec.mak +3 −2
configure+3−0
@@ -482,6 +482,7 @@ Developer options (useful when working on FFmpeg itself): · 481 unmodified lines
482482 --ignore-tests=TESTS comma-separated list (without "fate-" prefix
483483 in the name) of tests whose result is ignored
484484 --enable-linux-perf enable Linux Performance Monitor API
485+ --disable-large-tests disable tests that use a large amount of memory
485486
486487 NOTE: Object files are built at the place where configure is launched.
487488 EOF
@@ -1931,6 +1932,7 @@ CONFIG_LIST=" · 1443 unmodified lines
19311932 $SUBSYSTEM_LIST
19321933 autodetect
19331934 fontconfig
1935+ large_tests
19341936 linux_perf
19351937 memory_poisoning
19361938 neon_clobber_test
@@ -3727,6 +3729,7 @@ enable asm · 1790 unmodified lines
37273729 enable debug
37283730 enable doc
37293731 enable faan faandct faanidct
3732+enable large_tests
37303733 enable optimizations
37313734 enable runtime_cpudetect
37323735 enable safe_bitstream_reader
tests/Makefile+10−0
@@ -85,6 +85,16 @@ FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $( · 84 unmodified lines
8585
8686 PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER)
8787
88+# Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the
89+# make command line.
90+ifeq ($(LARGE_TESTS), yes)
91+CONFIG_LARGE_TESTS:=yes
92+!CONFIG_LARGE_TESTS:=
93+else ifeq ($(LARGE_TESTS), no)
94+CONFIG_LARGE_TESTS:=
95+!CONFIG_LARGE_TESTS:=yes
96+endif
97+
8898 include $(SRC_PATH)/$(APITESTSDIR)/Makefile
8999 include $(SRC_PATH)/$(DNNTESTSDIR)/Makefile
90100
tests/fate/seek.mak+2−1
@@ -64,7 +64,6 @@ FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV1, AVI) += asv1 · 63 unmodified lines
6464 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2, AVI) += asv2
6565 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p
6666 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p-rd
67−FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-4k-hr-lb
6867 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i
6968 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv
7069 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv-411
@@ -80,6 +79,8 @@ FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, JPEGLS, AVI) += jpegls · 9 unmodified lines
8079 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
8180 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG, AVI) += mjpeg
8281
82+FATE_SEEK_VSYNTH_LENA-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb
83+
8384 FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \
8485 mpeg1 \
8586 mpeg1b
tests/fate/vcodec.mak+3−2
@@ -29,13 +29,14 @@ FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p \ · 28 unmodified lines
2929 dnxhd-720p-rd \
3030 dnxhd-720p-10bit \
3131 dnxhd-720p-hr-lb \
32− dnxhd-4k-hr-lb \
3332 dnxhd-uhd-hr-sq \
34− dnxhd-2k-hr-hq \
3533 dnxhd-edge1-hr \
3634 dnxhd-edge2-hr \
3735 dnxhd-edge3-hr
3836
37+FATE_VCODEC-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb \
38+ dnxhd-2k-hr-hq
39+
3940 FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \
4041 vc2-422p vc2-422p10 vc2-422p12 \
4142 vc2-444p vc2-444p10 vc2-444p12 \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t