Skip to content

Commit c7a0585

Browse files
committed
Tests: prevent broken terminal after tc[gs]etattr ffmpeg race.
Running multiple ffmpeg processes could lead to save/restore of the already alternated terminal state.
1 parent 9a31bb8 commit c7a0585

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

mp4.t

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ EOF
5353

5454
plan(skip_all => 'no lavfi')
5555
unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`;
56-
system('ffmpeg -loglevel quiet -y '
56+
system('ffmpeg -nostdin -loglevel quiet -y '
5757
. '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 '
5858
. '-f lavfi -i testsrc=duration=20:size=320x200:rate=15 '
5959
. '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v libx264 '
6060
. "${\($t->testdir())}/test.mp4") == 0
6161
or die "Can't create mp4 file: $!";
62-
system('ffmpeg -loglevel quiet -y '
62+
system('ffmpeg -nostdin -loglevel quiet -y '
6363
. '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 '
6464
. '-f lavfi -i testsrc=duration=20:size=320x200:rate=15 '
6565
. '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v libx264 '

mp4_ssi.t

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ EOF
5252

5353
plan(skip_all => 'no lavfi')
5454
unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`;
55-
system('ffmpeg -loglevel quiet -y '
55+
system('ffmpeg -nostdin -loglevel quiet -y '
5656
. '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 '
5757
. '-f lavfi -i testsrc=duration=20:size=320x200:rate=15 '
5858
. '-map 0:0 -map 1:0 -pix_fmt yuv420p -g 15 -c:v libx264 '

range_mp4.t

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ http {
4848
EOF
4949

5050
plan(skip_all => 'no lavfi')
51-
unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`;
51+
unless grep /lavfi/, `ffmpeg -nostdin -loglevel quiet -formats`;
5252
system('ffmpeg -loglevel quiet -y '
5353
. '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 '
5454
. "-pix_fmt yuv420p -c:v libx264 ${\($t->testdir())}/test.mp4") == 0

0 commit comments

Comments
 (0)