# HG changeset patch # User Sergey Kandaurov # Date 1397222674 -14400 # Node ID 7a65ebfdb02eb42f99f29f61118e2927d25ebcd4 # Parent c24d1c0b4c7349f0a1b89781874f8c15a460bedf Tests: skip mp4 if ffmpeg does not support lavfi format. diff --git a/mp4.t b/mp4.t --- a/mp4.t +++ b/mp4.t @@ -25,7 +25,7 @@ select STDOUT; $| = 1; my $t = Test::Nginx->new()->has(qw/http mp4/)->has_daemon('ffprobe') ->has_daemon('ffmpeg') - ->plan(14)->write_file_expand('nginx.conf', <<'EOF'); + ->write_file_expand('nginx.conf', <<'EOF'); %%TEST_GLOBALS%% @@ -49,6 +49,8 @@ http { EOF +plan(skip_all => 'no lavfi') + unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; system('ffmpeg -loglevel quiet -y ' . '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 ' . '-f lavfi -i testsrc=duration=20:size=320x200:rate=15 ' @@ -56,7 +58,7 @@ system('ffmpeg -loglevel quiet -y ' . "${\($t->testdir())}/test.mp4") == 0 or die "Can't create mp4 file: $!"; -$t->run(); +$t->run()->plan(14); ############################################################################### diff --git a/range_mp4.t b/range_mp4.t --- a/range_mp4.t +++ b/range_mp4.t @@ -22,7 +22,7 @@ use Test::Nginx; select STDERR; $| = 1; select STDOUT; $| = 1; -my $t = Test::Nginx->new()->has(qw/http mp4/)->has_daemon('ffmpeg')->plan(13); +my $t = Test::Nginx->new()->has(qw/http mp4/)->has_daemon('ffmpeg'); $t->write_file_expand('nginx.conf', <<'EOF'); @@ -47,12 +47,14 @@ http { EOF +plan(skip_all => 'no lavfi') + unless grep /lavfi/, `ffmpeg -loglevel quiet -formats`; system('ffmpeg -loglevel quiet -y ' . '-f lavfi -i testsrc=duration=10:size=320x200:rate=15 ' . "-pix_fmt yuv420p -c:v libx264 ${\($t->testdir())}/test.mp4") == 0 or die "Can't create mp4 file: $!"; -$t->run(); +$t->run()->plan(13); ###############################################################################