diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-08 00:27:00 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-08 00:27:00 +0000 |
| commit | 21f7ab7afc1df88ee1b3a3d2e284a7fbd3e1a014 (patch) | |
| tree | 7134290834422d1e9127859b1ce2d47c8b5feafc | |
| parent | fc8cb3988fc239b254e093801e429b206cb43c62 (diff) | |
| download | ffmpeg-21f7ab7afc1df88ee1b3a3d2e284a7fbd3e1a014.tar.gz | |
Make ffserver regression test run (still fails)
Originally committed as revision 22305 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rwxr-xr-x | tests/ffserver-regression.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh index 220221fee7..11e4a5419e 100755 --- a/tests/ffserver-regression.sh +++ b/tests/ffserver-regression.sh @@ -14,7 +14,7 @@ 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 @@ -22,16 +22,13 @@ sleep 2 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 |