[FFmpeg-cvslog] r22304 - in trunk/tests: ffserver-regression.sh md5.sh regression-funcs.sh

[mru]

Author: mru
Date: Mon Mar  8 01:26:58 2010
New Revision: 22304

Log:
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.

Added:
   trunk/tests/md5.sh
Modified:
   trunk/tests/ffserver-regression.sh
   trunk/tests/regression-funcs.sh

Modified: trunk/tests/ffserver-regression.sh
==============================================================================
--- trunk/tests/ffserver-regression.sh	Mon Mar  8 01:26:54 2010	(r22303)
+++ trunk/tests/ffserver-regression.sh	Mon Mar  8 01:26:58 2010	(r22304)
@@ -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)
 

Added: trunk/tests/md5.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/tests/md5.sh	Mon Mar  8 01:26:58 2010	(r22304)
@@ -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

Modified: trunk/tests/regression-funcs.sh
==============================================================================
--- trunk/tests/regression-funcs.sh	Mon Mar  8 01:26:54 2010	(r22303)
+++ trunk/tests/regression-funcs.sh	Mon Mar  8 01:26:58 2010	(r22304)
@@ -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"