diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-12-26 11:33:23 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-12-26 11:33:23 +0000 |
| commit | 66d23c968c4b1534d347d46325cb9e5d4de285f4 (patch) | |
| tree | 1621fcfadd8cecfe7182ae955488c480b92135c9 /tests | |
| parent | 3d1470649c91aa9d325b94aef54fc15b8185356d (diff) | |
| download | ffmpeg-66d23c968c4b1534d347d46325cb9e5d4de285f4.tar.gz | |
Use common regression test functions in ffserver regression test script.
This makes the ffserver regression test more portable.
Originally committed as revision 20925 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/ffserver-regression.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh index 592787d745..182fe2d35c 100755 --- a/tests/ffserver-regression.sh +++ b/tests/ffserver-regression.sh @@ -3,6 +3,8 @@ #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf +. $(dirname $0)/regression-funcs.sh + FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html) rm -f tests/feed1.ffm @@ -24,7 +26,7 @@ sleep 2 done wait # the status page is always different - md5sum $MDFILES > ffserver.regression + do_md5sum $MDFILES > ffserver.regression ) kill $FFSERVER_PID wait > /dev/null 2>&1 |