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
482 --ignore-tests=TESTS comma-separated list (without "fate-" prefix482 --ignore-tests=TESTS comma-separated list (without "fate-" prefix
483 in the name) of tests whose result is ignored483 in the name) of tests whose result is ignored
484 --enable-linux-perf enable Linux Performance Monitor API484 --enable-linux-perf enable Linux Performance Monitor API
485 --disable-large-tests disable tests that use a large amount of memory
485 486
486NOTE: Object files are built at the place where configure is launched.487NOTE: Object files are built at the place where configure is launched.
487EOF488EOF
@@ -1931,6 +1932,7 @@ CONFIG_LIST=" · 1443 unmodified lines
1931 $SUBSYSTEM_LIST1932 $SUBSYSTEM_LIST
1932 autodetect1933 autodetect
1933 fontconfig1934 fontconfig
1935 large_tests
1934 linux_perf1936 linux_perf
1935 memory_poisoning1937 memory_poisoning
1936 neon_clobber_test1938 neon_clobber_test
@@ -3727,6 +3729,7 @@ enable asm · 1790 unmodified lines
3727enable debug3729enable debug
3728enable doc3730enable doc
3729enable faan faandct faanidct3731enable faan faandct faanidct
3732enable large_tests
3730enable optimizations3733enable optimizations
3731enable runtime_cpudetect3734enable runtime_cpudetect
3732enable safe_bitstream_reader3735enable safe_bitstream_reader
tests/Makefile+10−0
@@ -85,6 +85,16 @@ FILTERDEMDECENCMUX = $(call ALLYES, $(1:%=%_FILTER) $(2)_DEMUXER $(3)_DECODER $( · 84 unmodified lines
85 85
86PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER)86PARSERDEMDEC = $(call ALLYES, $(1)_PARSER $(2)_DEMUXER $(3)_DECODER)
87 87
88# Allow overriding CONFIG_LARGE_TESTS via LARGE_TESTS, if set on the
89# make command line.
90ifeq ($(LARGE_TESTS), yes)
91CONFIG_LARGE_TESTS:=yes
92!CONFIG_LARGE_TESTS:=
93else ifeq ($(LARGE_TESTS), no)
94CONFIG_LARGE_TESTS:=
95!CONFIG_LARGE_TESTS:=yes
96endif
97
88include $(SRC_PATH)/$(APITESTSDIR)/Makefile98include $(SRC_PATH)/$(APITESTSDIR)/Makefile
89include $(SRC_PATH)/$(DNNTESTSDIR)/Makefile99include $(SRC_PATH)/$(DNNTESTSDIR)/Makefile
90 100
tests/fate/seek.mak+2−1
@@ -64,7 +64,6 @@ FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV1, AVI) += asv1 · 63 unmodified lines
64FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2, AVI) += asv264FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, ASV2, AVI) += asv2
65FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p65FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p
66FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p-rd66FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p-rd
67FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-4k-hr-lb
68FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i67FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DNXHD, MOV) += dnxhd-1080i
69FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv68FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv
70FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, DVVIDEO, DV) += dv-41169FATE_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
80FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg79FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
81FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG, AVI) += mjpeg80FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MJPEG, AVI) += mjpeg
82 81
82FATE_SEEK_VSYNTH_LENA-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb
83
83FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \84FATE_SEEK_VSYNTH_LENA-$(call ENCDEC, MPEG1VIDEO, MPEG1VIDEO MPEGVIDEO) += \
84 mpeg1 \85 mpeg1 \
85 mpeg1b86 mpeg1b
tests/fate/vcodec.mak+3−2
@@ -29,13 +29,14 @@ FATE_VCODEC-$(call ENCDEC, DNXHD, DNXHD) += dnxhd-720p \ · 28 unmodified lines
29 dnxhd-720p-rd \29 dnxhd-720p-rd \
30 dnxhd-720p-10bit \30 dnxhd-720p-10bit \
31 dnxhd-720p-hr-lb \31 dnxhd-720p-hr-lb \
32 dnxhd-4k-hr-lb \
33 dnxhd-uhd-hr-sq \32 dnxhd-uhd-hr-sq \
34 dnxhd-2k-hr-hq \
35 dnxhd-edge1-hr \33 dnxhd-edge1-hr \
36 dnxhd-edge2-hr \34 dnxhd-edge2-hr \
37 dnxhd-edge3-hr35 dnxhd-edge3-hr
38 36
37FATE_VCODEC-$(call ALLYES, DNXHD_ENCODER DNXHD_DECODER LARGE_TESTS) += dnxhd-4k-hr-lb \
38 dnxhd-2k-hr-hq
39
39FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \40FATE_VCODEC-$(call ENCDEC, VC2 DIRAC, MOV) += vc2-420p vc2-420p10 vc2-420p12 \
40 vc2-422p vc2-422p10 vc2-422p12 \41 vc2-422p vc2-422p10 vc2-422p12 \
41 vc2-444p vc2-444p10 vc2-444p12 \42 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