[Ffmpeg-cvslog] CVS: ffmpeg/tests ffserver.regression.ref, 1.15, 1.16 server-regression.sh, 1.11, 1.12

[Aurelien Jacobs CVS]

Update of /cvsroot/ffmpeg/ffmpeg/tests
In directory mail:/var2/tmp/cvs-serv5095/tests

Modified Files:
	ffserver.regression.ref server-regression.sh 
Log Message:
get ride of perl and sort in ffserver regtest (and avoid problem with behavior of sort changing with locales)

Index: ffserver.regression.ref
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/ffserver.regression.ref,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ffserver.regression.ref	23 Feb 2006 23:44:05 -0000	1.15
+++ ffserver.regression.ref	23 Feb 2006 23:50:32 -0000	1.16
@@ -1,12 +1,12 @@
-d41d8cd98f00b204e9800998ecf8427e  ff-test.jpg
-6ce0af834ee0abf4753df419f67648c5  ff-test.mjpg
-0f1795f0496f37aeea6272d272140efa  ff-test.swf
-f842864a654593ea9ee9d7a1bd024627  ff-test_h.asf
 03867bfc9f7dd494cbe2b71aa0ce6537  ff-test_h.avi
-d41d8cd98f00b204e9800998ecf8427e  ff-test_h.mpg
-71bfe6784e025f6eea9f92113d8c7dda  ff-test_h.rm
-5c12fa55e6b7fbade1b142ecf430a679  ff-test_l.asf
 ef4887809ddeb782ed66bf34cb506dcf  ff-test_l.avi
+d41d8cd98f00b204e9800998ecf8427e  ff-test_h.mpg
 d41d8cd98f00b204e9800998ecf8427e  ff-test_l.mpg
+0f1795f0496f37aeea6272d272140efa  ff-test.swf
+f842864a654593ea9ee9d7a1bd024627  ff-test_h.asf
+5c12fa55e6b7fbade1b142ecf430a679  ff-test_l.asf
+71bfe6784e025f6eea9f92113d8c7dda  ff-test_h.rm
 d5c1cc12240a4169abea3fb0fc7f4db3  ff-test_l.rm
+d41d8cd98f00b204e9800998ecf8427e  ff-test.jpg
 d41d8cd98f00b204e9800998ecf8427e  ff-test_small.jpg
+6ce0af834ee0abf4753df419f67648c5  ff-test.mjpg

Index: server-regression.sh
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/server-regression.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- server-regression.sh	17 Dec 2005 18:14:38 -0000	1.11
+++ server-regression.sh	23 Feb 2006 23:50:33 -0000	1.12
@@ -14,7 +14,7 @@
 #perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
 #perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
 
-FILES=`perl -n -e 'print \$1, "\n" if /<stream\\s+(\\S+)>/i' data/test.conf | sort`
+FILES=`sed -n 's/.*<Stream \(.*\)>.*/\1/p' data/test.conf | grep -v html`
 
 rm -f /tmp/feed.ffm
 ../ffserver -d -f data/test.conf 2> /dev/null &
@@ -35,7 +35,7 @@
     done
     wait
     # the status page is always different
-    md5sum $MDFILES | grep -v html > ffserver.regression
+    md5sum $MDFILES > ffserver.regression
 )
 kill $FFSERVER_PID
 wait > /dev/null 2>&1