[FFmpeg-cvslog] r20925 - trunk/tests/ffserver-regression.sh

[diego]

Author: diego
Date: Sat Dec 26 12:33:23 2009
New Revision: 20925

Log:
Use common regression test functions in ffserver regression test script.
This makes the ffserver regression test more portable.

Modified:
   trunk/tests/ffserver-regression.sh

Modified: trunk/tests/ffserver-regression.sh
==============================================================================
--- trunk/tests/ffserver-regression.sh	Sat Dec 26 12:24:04 2009	(r20924)
+++ trunk/tests/ffserver-regression.sh	Sat Dec 26 12:33:23 2009	(r20925)
@@ -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