[FFmpeg-cvslog] r18226 - in trunk: Makefile tests/ffserver.conf tests/server-regression.sh tests/test.conf

[diego]

Author: diego
Date: Sun Mar 29 22:17:23 2009
New Revision: 18226

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

Added:
   trunk/tests/ffserver.conf
      - copied, changed from r18218, trunk/tests/test.conf
Deleted:
   trunk/tests/test.conf
Modified:
   trunk/Makefile
   trunk/tests/server-regression.sh

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Sun Mar 29 20:15:02 2009	(r18225)
+++ trunk/Makefile	Sun Mar 29 22:17:23 2009	(r18226)
@@ -282,7 +282,7 @@ servertest: ffserver$(EXESUF) tests/vsyn
 	@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

Copied and modified: trunk/tests/ffserver.conf (from r18218, trunk/tests/test.conf)
==============================================================================
--- trunk/tests/test.conf	Sun Mar 29 16:42:52 2009	(r18218, copy source)
+++ trunk/tests/ffserver.conf	Sun Mar 29 22:17:23 2009	(r18226)
@@ -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

Modified: trunk/tests/server-regression.sh
==============================================================================
--- trunk/tests/server-regression.sh	Sun Mar 29 20:15:02 2009	(r18225)
+++ trunk/tests/server-regression.sh	Sun Mar 29 22:17:23 2009	(r18226)
@@ -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`