ffserver-regression.sh doesn't need anything else from regression-funcs.sh, and sourcing the entire file there breaks things. Originally committed as revision 22304 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.6
| @@ -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 $_>\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 | #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) | FILES=$(sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html) | ||||
| @@ -0,0 +1,11 @@ | |||||
| # try to find an md5 program | |||||
| if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then | |||||
| do_md5sum() { md5sum -b $1; } | |||||
| elif [ X"$(echo | md5 2> /dev/null)" != X ]; then | |||||
| do_md5sum() { md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } | |||||
| elif [ -x /sbin/md5 ]; then | |||||
| do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; } | |||||
| else | |||||
| do_md5sum() { echo No md5sum program found; } | |||||
| fi | |||||
| @@ -39,15 +39,7 @@ mkdir -p "$outfile" | |||||
| [ "${V-0}" -gt 0 ] && echov=echo || echov=: | [ "${V-0}" -gt 0 ] && echov=echo || echov=: | ||||
| [ "${V-0}" -gt 1 ] || exec 2>$errfile | [ "${V-0}" -gt 1 ] || exec 2>$errfile | ||||
| if [ X"$(echo | md5sum 2> /dev/null)" != X ]; then | |||||
| do_md5sum() { md5sum -b $1; } | |||||
| elif [ X"$(echo | md5 2> /dev/null)" != X ]; then | |||||
| do_md5sum() { md5 $1 | sed 's#MD5 (\(.*\)) = \(.*\)#\2 *\1#'; } | |||||
| elif [ -x /sbin/md5 ]; then | |||||
| do_md5sum() { /sbin/md5 -r $1 | sed 's# \**\./# *./#'; } | |||||
| else | |||||
| do_md5sum() { echo No md5sum program found; } | |||||
| fi | |||||
| . $(dirname $0)/md5.sh | |||||
| FFMPEG_OPTS="-v 0 -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact" | FFMPEG_OPTS="-v 0 -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact" | ||||