mirror of https://git.ffmpeg.org/ffmpeg.git
Rename test.conf --> ffserver.conf, the new name is more meaningful.
Originally committed as revision 18226 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
aadf88119e
commit
688a477367
2
Makefile
2
Makefile
|
@ -282,7 +282,7 @@ servertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/asynth1.sw
|
|||
@echo "Unfortunately ffserver is broken and therefore its regression"
|
||||
@echo "test fails randomly. Treat the results accordingly."
|
||||
@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)
|
||||
mkdir -p tests/vsynth1
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# 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
|
||||
# has been populated. Then point your browser at http://whatever:9999/teststat.html
|
||||
# and you can look at the streams
|
|
@ -3,8 +3,8 @@
|
|||
# Make sure that the data directory exists
|
||||
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 $_.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 $_>\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/ffserver.conf
|
||||
|
||||
FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
|
||||
|
||||
|
|
Loading…
Reference in New Issue