diff --git a/tests/ffserver-regression.sh b/tests/ffserver-regression.sh index 182fe2d35cf0316f78a3dba640a1120bea765249..220221fee754383da0ced9ffb7697fb7bf2745b2 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/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "\nFile $wd/tests/data/$_\n\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf -. $(dirname $0)/regression-funcs.sh +. $(dirname $0)/md5.sh FILES=$(sed -n 's/^[^#]*.*/\1/p' $2 | grep -v html) diff --git a/tests/md5.sh b/tests/md5.sh new file mode 100644 index 0000000000000000000000000000000000000000..6809169bd28906fdae9cdfac24f76a66d57aabbf --- /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 7aa57e0f7e4231db5447d65e6ecc02da83eebff4..8fd17abd064d01825bfb5b0a12ef19ba7b28e103 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"