diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2014-08-28 13:15:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-04 15:21:50 +0200 |
| commit | c4abee734dcbdb589925dd6da98041dcf663ce49 (patch) | |
| tree | 0eee7c2460e11e608c91bc328774da77a126f93b /tests/fate | |
| parent | 03efd7308289a57fd60df96b2f79e7522dfe844e (diff) | |
| download | ffmpeg-c4abee734dcbdb589925dd6da98041dcf663ce49.tar.gz | |
Remove non-free tests/lena.pnm and adapt FATE tests to depend on lena.pnm in the SAMPLES directory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/ffmpeg.mak | 2 | ||||
| -rw-r--r-- | tests/fate/seek.mak | 11 | ||||
| -rw-r--r-- | tests/fate/vcodec.mak | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 218f7d842b..a6cb159f60 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -21,7 +21,7 @@ fate-ffmpeg-filter_complex: CMD = framecrc -filter_complex color=d=1:r=5 FATE_FFMPEG-$(CONFIG_COLOR_FILTER) += fate-ffmpeg-lavfi fate-ffmpeg-lavfi: CMD = framecrc -lavfi color=d=1:r=5 -FATE_FFMPEG-$(CONFIG_RAWVIDEO_DEMUXER) += fate-force_key_frames +FATE_SAMPLES_FFMPEG-$(CONFIG_RAWVIDEO_DEMUXER) += fate-force_key_frames fate-force_key_frames: tests/data/vsynth2.yuv fate-force_key_frames: CMD = enc_dec \ "rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \ diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index 0dca1fa778..e511387cd4 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -155,7 +155,7 @@ fate-seek-vsynth2-wmv1: SRC = fate/vsynth2-wmv1.avi fate-seek-vsynth2-wmv2: SRC = fate/vsynth2-wmv2.avi fate-seek-vsynth2-yuv: SRC = fate/vsynth2-yuv.avi -FATE_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%) +FATE_SAMPLES_SEEK += $(FATE_SEEK_VSYNTH2-yes:%=fate-seek-vsynth2-%) # files from fate-lavf @@ -237,10 +237,11 @@ fate-seek-lavf-yuv4mpeg: SRC = lavf/lavf.y4m FATE_SEEK += $(FATE_SEEK_LAVF-yes:%=fate-seek-lavf-%) -$(FATE_SEEK): libavformat/seek-test$(EXESUF) -$(FATE_SEEK): CMD = run libavformat/seek-test$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC) -$(FATE_SEEK): fate-seek-%: fate-% +$(FATE_SEEK) $(FATE_SAMPLES_SEEK): libavformat/seek-test$(EXESUF) +$(FATE_SEEK) $(FATE_SAMPLES_SEEK): CMD = run libavformat/seek-test$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC) +$(FATE_SEEK) $(FATE_SAMPLES_SEEK): fate-seek-%: fate-% fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%) FATE_AVCONV += $(FATE_SEEK) -fate-seek: $(FATE_SEEK) +FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_SEEK) +fate-seek: $(FATE_SEEK) $(FATE_SAMPLES_SEEK) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index ec3155ab16..c7150719b2 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -318,7 +318,8 @@ $(FATE_VSYNTH1): tests/data/vsynth1.yuv $(FATE_VSYNTH2): tests/data/vsynth2.yuv $(FATE_VSYNTH3): tests/data/vsynth3.yuv -FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH2) $(FATE_VSYNTH3) +FATE_AVCONV += $(FATE_VSYNTH1) $(FATE_VSYNTH3) +FATE_SAMPLES_AVCONV += $(FATE_VSYNTH2) fate-vsynth1: $(FATE_VSYNTH1) fate-vsynth2: $(FATE_VSYNTH2) |