diff options
| author | Clément Bœsch <u@pkh.me> | 2015-04-26 19:29:40 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2015-04-27 18:25:38 +0200 |
| commit | 2879a4ecb9c31430dae75af79696ef4f94ce6b46 (patch) | |
| tree | a1d617124cc7ea55aa7244fd96c517537ad69c27 /tests | |
| parent | 11d29277d6484fc1728278b4f211475376f30256 (diff) | |
tests: make sure subtitles tests are run with a rawdiff
This will test properly CRLF with make fate, make fate-subtitles and any
make fate-sub-* test. Before this commit, the rawdiff was triggered only
by make fate-subtitles.
Also make sure fate-sub-* only match the tests relying on fmtstdout
command, to at least avoid failing on MingW. See
https://ffmpeg.org/pipermail/ffmpeg-devel/2015-April/172395.html
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/fate/subtitles.mak | 7 | ||||
| -rw-r--r-- | tests/ref/fate/binsub-movtextenc (renamed from tests/ref/fate/sub-movtextenc) | 0 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak index 53cd4cb085..07d886a0af 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -13,8 +13,8 @@ fate-sub-microdvd-remux: CMD = fmtstdout microdvd -i $(TARGET_SAMPLES)/sub/Micro FATE_SUBTITLES_ASS-$(call DEMDEC, MOV, MOVTEXT) += fate-sub-movtext fate-sub-movtext: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-sub-movtextenc -fate-sub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -movflags frag_keyframe+empty_moov +FATE_SUBTITLES-$(call ENCDEC, MOVTEXT, MOV) += fate-binsub-movtextenc +fate-binsub-movtextenc: CMD = md5 -i $(TARGET_SAMPLES)/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -movflags frag_keyframe+empty_moov FATE_SUBTITLES_ASS-$(call DEMDEC, MPL2, MPL2) += fate-sub-mpl2 fate-sub-mpl2: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPL2_capability_tester.txt @@ -64,6 +64,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes) FATE_SUBTITLES += $(FATE_SUBTITLES-yes) +fate-sub-%: CMP = rawdiff + FATE_SAMPLES_FFMPEG += $(FATE_SUBTITLES) -fate-subtitles: CMP = rawdiff fate-subtitles: $(FATE_SUBTITLES) diff --git a/tests/ref/fate/sub-movtextenc b/tests/ref/fate/binsub-movtextenc index 6efe2c015a..6efe2c015a 100644 --- a/tests/ref/fate/sub-movtextenc +++ b/tests/ref/fate/binsub-movtextenc |