Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename test.conf --> ffserver.conf, the new name is more meaningful.

Browse Source 
Originally committed as revision 18226 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Diego Biurrun 16 years ago
parent aadf88119e
commit 688a477367
3 changed files with 4 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 2
      tests/ffserver.conf
  3. 4
      tests/server-regression.sh

2
Makefile
Unescape View File

@ -282,7 +282,7 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
@echo "Unfortunately ffserver is broken and therefore its regression" @echo "Unfortunately ffserver is broken and therefore its regression"
@echo "test fails randomly. Treat the results accordingly." @echo "test fails randomly. Treat the results accordingly."
@echo @echo
$(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/test.conf $(SRC_PATH)/tests/server-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF) tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
mkdir -p tests/vsynth1 mkdir -p tests/vsynth1

2
tests/test.conf → tests/ffserver.conf
Unescape View File

@ -1,6 +1,6 @@
# #
# This is a test configuration file. You can invoke it with # This is a test configuration file. You can invoke it with
# ../ffserver -f test.conf # ../ffserver -f ffserver.conf
# when in the tests directory and once the vsynth1 subdirectory # when in the tests directory and once the vsynth1 subdirectory
# has been populated. Then point your browser at http://whatever:9999/teststat.html # has been populated. Then point your browser at http://whatever:9999/teststat.html
# and you can look at the streams # and you can look at the streams

4
tests/server-regression.sh
Unescape View File

@ -3,8 +3,8 @@
# Make sure that the data directory exists # Make sure that the data directory exists
mkdir -p tests/data mkdir -p tests/data
#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
#perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/test.conf #perl -e 'chomp($wd = `pwd`); print map { s!tests/data/!!; "<Stream $_.asf>\nFile $wd/tests/data/$_\n</Stream>\n\n" } @ARGV' tests/data/a* >> tests/data/ffserver.conf
FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html` FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`

Write Preview
Loading…
Cancel
Save