virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 5068 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2006-02-26 22:49:16 +00:00
parent 0403f791b3
commit 59f45163df
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ffserver.regression.ref
View File

@ -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

2
tests/server-regression.sh
View File

@ -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 &