Index: patched-ffmpeg-mt/tests/ffserver-regression.sh |
=================================================================== |
--- patched-ffmpeg-mt/tests/ffserver-regression.sh (revision 41250) |
+++ patched-ffmpeg-mt/tests/ffserver-regression.sh (working copy) |
@@ -3,7 +3,7 @@ |
#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 |
+. $(dirname $0)/md5.sh |
FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html) |
@@ -14,7 +14,7 @@ |
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 |
@@ -22,16 +22,13 @@ |
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 |
- do_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 |