simplify, use ffserver launch directive

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13367 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index b95b5a57d4fd212559b0c1f0d62eef184d47eb98..24685aad64f2399c9653ff08c2441fb62e7dcf02 100755 (executable)
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -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

diff --git a/tests/test.conf b/tests/test.conf
index afd4c16fbf2ec2de4350f8b37d6e77a9a8f38b4e..571048c3ea709569b75586d53f3f151dfc492723 100644 (file)
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -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>