This fixes a long-standing issue where running FATE in parallel could result
in the terminal being left misconfigured, particularly if a test failed or
was canceled wtih ^C.
---
tests/fate/vpx.mak | 10 +++++-----
tests/regression-funcs.sh | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak
index 3750561..46658ec 100644
--- a/tests/fate/vpx.mak
+++ b/tests/fate/vpx.mak
@@ -56,19 +56,19 @@ FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-alpha
fate-vp8-alpha: CMD = framecrc -i
$(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm -vcodec copy
FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest
-fate-webm-dash-manifest: CMD = run $(FFMPEG) -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f
webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" -
+fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i
$(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f
webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" -
FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) +=
fate-webm-dash-manifest-unaligned-video-streams
-fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0
-map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin
-f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0
-map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) +=
fate-webm-dash-manifest-unaligned-audio-streams
-fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0
-map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin
-f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0
-map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) +=
fate-webm-dash-manifest-representations
-fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0
-map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
+fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f
webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0
-map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" -
FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live
-fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -f webm_dash_manifest -live
1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live
1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -f
webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1"
-chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200
-minimum_update_period 60 -debug_mode 1 -
+fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f
webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f
webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c
copy -map 0 -map 1 -f webm_dash_manifest -live 1 -adaptation_sets
"id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000
-time_shift_buffer_depth 7200 -minimum_update_period 60 -debug_mode 1 -
FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-2451
fate-vp8-2451: CMD = framecrc -flags +bitexact -i
$(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index 19bceca..0c7d34b 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -43,7 +43,7 @@ echov(){
. $(dirname $0)/md5.sh
-AVCONV_OPTS="-nostats -y -cpuflags $cpuflags"
+AVCONV_OPTS="-nostdin -nostats -y -cpuflags $cpuflags"
COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact
-fflags +bitexact"
DEC_OPTS="$COMMON_OPTS -threads $threads"
ENC_OPTS="$COMMON_OPTS -threads $threads -dct fastint"
--
2.10.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
