Browse code

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

Originally committed as revision 5058 to svn://svn.ffmpeg.org/ffmpeg/trunk

Aurelien Jacobs authored on 2006/02/24 08:50:33
Showing 2 changed files
... ...
@@ -1,12 +1,12 @@
1
-d41d8cd98f00b204e9800998ecf8427e  ff-test.jpg
2
-6ce0af834ee0abf4753df419f67648c5  ff-test.mjpg
3
-0f1795f0496f37aeea6272d272140efa  ff-test.swf
4
-f842864a654593ea9ee9d7a1bd024627  ff-test_h.asf
5 1
 03867bfc9f7dd494cbe2b71aa0ce6537  ff-test_h.avi
6
-d41d8cd98f00b204e9800998ecf8427e  ff-test_h.mpg
7
-71bfe6784e025f6eea9f92113d8c7dda  ff-test_h.rm
8
-5c12fa55e6b7fbade1b142ecf430a679  ff-test_l.asf
9 2
 ef4887809ddeb782ed66bf34cb506dcf  ff-test_l.avi
3
+d41d8cd98f00b204e9800998ecf8427e  ff-test_h.mpg
10 4
 d41d8cd98f00b204e9800998ecf8427e  ff-test_l.mpg
5
+0f1795f0496f37aeea6272d272140efa  ff-test.swf
6
+f842864a654593ea9ee9d7a1bd024627  ff-test_h.asf
7
+5c12fa55e6b7fbade1b142ecf430a679  ff-test_l.asf
8
+71bfe6784e025f6eea9f92113d8c7dda  ff-test_h.rm
11 9
 d5c1cc12240a4169abea3fb0fc7f4db3  ff-test_l.rm
10
+d41d8cd98f00b204e9800998ecf8427e  ff-test.jpg
12 11
 d41d8cd98f00b204e9800998ecf8427e  ff-test_small.jpg
12
+6ce0af834ee0abf4753df419f67648c5  ff-test.mjpg
... ...
@@ -14,7 +14,7 @@ cp "$2" data/test.conf
14 14
 #perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
15 15
 #perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
16 16
 
17
-FILES=`perl -n -e 'print \$1, "\n" if /<stream\\s+(\\S+)>/i' data/test.conf | sort`
17
+FILES=`sed -n 's/.*<Stream \(.*\)>.*/\1/p' data/test.conf | grep -v html`
18 18
 
19 19
 rm -f /tmp/feed.ffm
20 20
 ../ffserver -d -f data/test.conf 2> /dev/null &
... ...
@@ -35,7 +35,7 @@ sleep 2
35 35
     done
36 36
     wait
37 37
     # the status page is always different
38
-    md5sum $MDFILES | grep -v html > ffserver.regression
38
+    md5sum $MDFILES > ffserver.regression
39 39
 )
40 40
 kill $FFSERVER_PID
41 41
 wait > /dev/null 2>&1