1. ffmpeg
  2. Commit 59f45163dff9842fe2a771566504ae83a2df6f46
Browse code

don't try to test streams which are commented out in test.conf

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

Aurelien Jacobs authored on 2006/02/27 07:49:16
Showing 2 changed files
tests/ffserver.regression.ref
History View file @ 59f4516
... ... 
@@ -1,7 +1,5 @@
1 1 
 03867bfc9f7dd494cbe2b71aa0ce6537  ff-test_h.avi
2 2 
 ef4887809ddeb782ed66bf34cb506dcf  ff-test_l.avi
3 
-d41d8cd98f00b204e9800998ecf8427e  ff-test_h.mpg
4 
-d41d8cd98f00b204e9800998ecf8427e  ff-test_l.mpg
5 3 
 0f1795f0496f37aeea6272d272140efa  ff-test.swf
6 4 
 f842864a654593ea9ee9d7a1bd024627  ff-test_h.asf
7 5 
 5c12fa55e6b7fbade1b142ecf430a679  ff-test_l.asf
tests/server-regression.sh
History View file @ 59f4516
... ... 
@@ -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=`sed -n 's/.*<Stream \(.*\)>.*/\1/p' data/test.conf | grep -v html`
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 &