From: Diego Biurrun Date: Sat, 26 Dec 2009 11:33:23 +0000 (+0000) Subject: Use common regression test functions in ffserver regression test script. X-Git-Tag: v0.6~2244 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=66d23c968c4b1534d347d46325cb9e5d4de285f4;p=coroid%2Fffmpeg_saccubus.git 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 --- diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh index 592787d74..182fe2d35 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/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf +. $(dirname $0)/regression-funcs.sh + FILES=$(sed -n 's/^[^#]*.*/\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