diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-03-08 00:26:58 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-03-08 00:26:58 +0000 |
| commit | fc8cb3988fc239b254e093801e429b206cb43c62 (patch) | |
| tree | e3a4b428badc2f1dc0dc17bfd5e021c7b5aad09d | |
| parent | ffabdaa14a09bfdce0aa2fc84599bf732d72e44c (diff) | |
regtest: move md5sum wrappers into separate file
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/trunk
| -rwxr-xr-x | tests/ffserver-regression.sh | 2 | ||||
| -rw-r--r-- | tests/md5.sh | 11 | ||||
| -rwxr-xr-x | tests/regression-funcs.sh | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh index 182fe2d35c..220221fee7 100755 --- a/tests/ffserver-regression.sh +++ b/tests/ffserver-regression.sh @@ -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) diff --git a/tests/md5.sh b/tests/md5.sh new file mode 100644 index 0000000000..6809169bd2 --- /dev/null +++ b/tests/md5.sh @@ -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 diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 7aa57e0f7e..8fd17abd06 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -39,15 +39,7 @@ mkdir -p "$outfile" [ "${V-0}" -gt 0 ] && echov=echo || echov=: [ "${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" |