Mercurial > hg > nginx-tests

changeset 390:7a65ebfdb02e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: skip mp4 if ffmpeg does not support lavfi format.
author Sergey Kandaurov <pluknet@nginx.com>
date Fri, 11 Apr 2014 17:24:34 +0400
parents c24d1c0b4c73
children 915ef26ac6eb
files mp4.t range_mp4.t
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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);
 
 ###############################################################################
 
--- 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);
 
 ###############################################################################