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

diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref
index a2f560c95f875aa9a22407d54b60382a9b77b9e9..e20c06253f70a7ee51becfe28b1fc39f0fe0bce6 100644 (file)
--- a/tests/ffserver.regression.ref
+++ b/tests/ffserver.regression.ref
@@ -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

diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index c93f99fa580c1a432ab76d02274c8aaec9e5e66b..e3562f118cc794922c81d6e969593e2a228e820c 100755 (executable)
--- a/tests/server-regression.sh
+++ b/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=`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 &