From fc8cb3988fc239b254e093801e429b206cb43c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Mon, 8 Mar 2010 00:26:58 +0000
Subject: [PATCH] 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
---
 tests/ffserver-regression.sh |  2 +-
 tests/md5.sh                 | 11 +++++++++++
 tests/regression-funcs.sh    | 10 +---------
 3 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 tests/md5.sh

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"
 
-- 
GitLab