get ride of perl and sort in ffserver regtest (and avoid problem with behavior...

get ride of perl and sort in ffserver regtest (and avoid problem with behavior of sort changing with locales)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5058 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

tests/ffserver.regression.ref

-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

tests/server-regression.sh

@@ -14,7 +14,7 @@ cp "$2" data/test.conf
 #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 @@ sleep 2
     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