[Ffmpeg-cvslog] CVS: ffmpeg/tests ffserver.regression.ref, 1.16, 1.17 server-regression.sh, 1.13, 1.14

[Aurelien Jacobs CVS]

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

Modified Files:
	ffserver.regression.ref server-regression.sh 
Log Message:
don't try to test streams which are commented out in test.conf

Index: ffserver.regression.ref
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/ffserver.regression.ref,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ffserver.regression.ref	23 Feb 2006 23:50:32 -0000	1.16
+++ ffserver.regression.ref	26 Feb 2006 22:49:16 -0000	1.17
@@ -1,7 +1,5 @@
 03867bfc9f7dd494cbe2b71aa0ce6537  ff-test_h.avi
 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

Index: server-regression.sh
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/tests/server-regression.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- server-regression.sh	24 Feb 2006 13:02:33 -0000	1.13
+++ server-regression.sh	26 Feb 2006 22:49:16 -0000	1.14
@@ -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=`sed -n 's/.*<Stream \(.*\)>.*/\1/p' data/test.conf | grep -v html`
+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 &