X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=tests%2Fffserver-regression.sh;h=11e4a5419ef07bf96dd26c01368b4df89c122624;hb=6cbf2420b95db9c65921c2f1c23105b9f7998338;hp=711e169006d3510ad2218dda1674266d56cba26b;hpb=7a8d0e970053d9e358f7667b38cb66bb7c2c91c1;p=ffmpeg

diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh
index 711e169006d..11e4a5419ef 100755
--- a/tests/ffserver-regression.sh
+++ b/tests/ffserver-regression.sh
@@ -3,7 +3,9 @@
 #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
 
-FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
+. $(dirname $0)/md5.sh
+
+FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html)
 
 rm -f tests/feed1.ffm
 ./ffserver -d -f "$2" 2> /dev/null &
@@ -12,24 +14,21 @@ echo "Waiting for feeds to startup..."
 sleep 2
 (
     cd tests/data || exit $?
-    rm -f ff-*;
+    rm -f ff-* ffserver.regression
     WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off"
     for file in $FILES; do
-        if [ `expr $file : "a-*"` != 0 ]; then
+        if [ $(expr $file : "a-*") != 0 ]; then
             wget $WGET_OPTIONS -O - http://localhost:9999/$file > ff-$file
         else
             wget $WGET_OPTIONS -O - http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=20000 > ff-$file 2>/dev/null
         fi
-        MDFILES="$MDFILES ff-$file"
+        do_md5sum ff-$file >>ffserver.regression
     done
-    wait
-    # the status page is always different
-    md5sum $MDFILES > ffserver.regression
 )
 kill $FFSERVER_PID
 wait > /dev/null 2>&1
 rm -f tests/feed1.ffm
-if diff -u tests/data/ffserver.regression "$1" ; then
+if diff -u "$1" tests/data/ffserver.regression; then
     echo
     echo Server regression test succeeded.
     exit 0