Commit 66d23c96 authored by Diego Biurrun's avatar Diego Biurrun

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
parent 3d147064
...@@ -3,6 +3,8 @@ ...@@ -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 $_>\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 #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) FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html)
rm -f tests/feed1.ffm rm -f tests/feed1.ffm
...@@ -24,7 +26,7 @@ sleep 2 ...@@ -24,7 +26,7 @@ sleep 2
done done
wait wait
# the status page is always different # the status page is always different
md5sum $MDFILES > ffserver.regression do_md5sum $MDFILES > ffserver.regression
) )
kill $FFSERVER_PID kill $FFSERVER_PID
wait > /dev/null 2>&1 wait > /dev/null 2>&1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment