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

[bcoudurier]

Author: bcoudurier
Date: Sun May 25 01:48:02 2008
New Revision: 13367

Log:
simplify, use ffserver launch directive

Modified:
   trunk/tests/server-regression.sh
   trunk/tests/test.conf

Modified: trunk/tests/server-regression.sh
==============================================================================
--- trunk/tests/server-regression.sh	(original)
+++ trunk/tests/server-regression.sh	Sun May 25 01:48:02 2008
@@ -12,8 +12,6 @@ rm -f tests/feed1.ffm
 ./ffserver -d -f tests/test.conf 2> /dev/null &
 FFSERVER_PID=$!
 echo "Waiting for feeds to startup..."
-./ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i tests/vsynth1/%02d.pgm http://localhost:9999/feed1.ffm 2> /dev/null &
-FFMPEG_PID=$!
 (
     cd tests/data || exit $?
     rm -f ff-*;
@@ -30,7 +28,6 @@ FFMPEG_PID=$!
     # the status page is always different
     md5sum $MDFILES > ffserver.regression
 )
-kill $FFMPEG_PID
 kill $FFSERVER_PID
 wait > /dev/null 2>&1
 rm -f tests/feed1.ffm

Modified: trunk/tests/test.conf
==============================================================================
--- trunk/tests/test.conf	(original)
+++ trunk/tests/test.conf	Sun May 25 01:48:02 2008
@@ -57,7 +57,7 @@ FileMaxSize 100M
 
 # Fire up ffmpeg pointing at this stream
 
-#Launch ../../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm
+Launch ./ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i tests/vsynth1/%02d.pgm
 
 ACL allow localhost
 </Feed>