fix the server regression test (it produced for me identical results in more runs, really).

Originally committed as revision 8074 to svn://svn.ffmpeg.org/ffmpeg/trunk

3 files changed, 24 insertions, 20 deletions

diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref
index 7350fa481b..851a40d224 100644
--- a/tests/ffserver.regression.ref
+++ b/tests/ffserver.regression.ref
@@ -1,10 +1,10 @@
-418d0c843a6605a7d48f285804a69df4  ff-test_h.avi
-ad4605187044d5e169f32a2ea205f937  ff-test_l.avi
-34f4f0c160efcdb37c0999680e07c41c  ff-test.swf
-fe6de6234a8bb4ace52b86763741cecd  ff-test_h.asf
-68e7c8a8ff64c4016a8d4e5ea27353f3  ff-test_l.asf
-cba8663681bf3ef89c95c09bb90204db  ff-test_h.rm
-0a14086c708a7b8f4604e705a2bb7087  ff-test_l.rm
-353a9a8fb3d5bb2334ac991b5c60f6d3  ff-test.jpg
-7cbd46a6174d8203c26be333980595b5  ff-test_small.jpg
-aaa459e638cd1dc2c120760fa4e1e384  ff-test.mjpg
+b33ed697236149e1503b60ca9f645b6f  ff-test_h.avi
+3c104d3664ed260be9117ed1273c6dcc  ff-test_l.avi
+d976848a9e4d5d8fc2659e4841cdece5  ff-test.swf
+5dd7a3cbc430f2534cdfc68030e4d5f5  ff-test_h.asf
+1111699f36f2fe2240d3e5c73827df50  ff-test_l.asf
+0b4c970507eeb57381c92c3309f2d982  ff-test_h.rm
+daaaa2e170f48f8bd423c0c45ab632c7  ff-test_l.rm
+e0dc91430660c619e97b5c82e0f398fc  ff-test.jpg
+0346739ee6ba2d3bbacb9814d00d7d2d  ff-test_small.jpg
+77a905f865ca536b6b92b9beb96beb94  ff-test.mjpg
diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index fb28fbae8b..0527ab64c5 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -10,26 +10,28 @@ fi
 # Make sure that the data directory exists
 mkdir -p data
 
-cp "$2" data/test.conf
 #perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
 #perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf
 
-FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' data/test.conf | grep -v html`
+FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' test.conf | grep -v html`
 
-rm -f /tmp/feed.ffm
-../ffserver -d -f data/test.conf 2> /dev/null &
+rm -f feed1.ffm
+../ffserver -d -f test.conf 2> /dev/null &
 FFSERVER_PID=$!
-echo "Waiting for feeds to startup..."
 sleep 2
+echo "Waiting for feeds to startup..."
+../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm http://localhost:9999/feed1.ffm 2> /dev/null &
+FFMPEG_PID=$!
+sleep 5
 (
     cd data || exit $?
     rm -f ff-*;
     WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off"
     for file in $FILES; do
         if [ `expr $file : "a-*"` != 0 ]; then
-            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file > ff-$file &
+            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file > ff-$file
         else
-            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=100000 > ff-$file 2>/dev/null &
+            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file?date=19700101T000000Z | dd bs=1 count=20000 > ff-$file 2>/dev/null
         fi
         MDFILES="$MDFILES ff-$file"
     done
@@ -37,6 +39,7 @@ sleep 2
     # the status page is always different
     md5sum $MDFILES > ffserver.regression
 )
+kill $FFMPEG_PID
 kill $FFSERVER_PID
 wait > /dev/null 2>&1
 if $diff_cmd data/ffserver.regression "$1" ; then
diff --git a/tests/test.conf b/tests/test.conf
index cc2038a60d..afd4c16fbf 100644
--- a/tests/test.conf
+++ b/tests/test.conf
@@ -52,13 +52,14 @@ CustomLog -
 # maximum size of the feed (100M bytes here). Default:
 # File=/tmp/feed_name.ffm FileMaxSize=5M
 
-File /tmp/feed.ffm
+File feed1.ffm
 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
-acl allow localhost
+#Launch ../../ffmpeg -loop_input -flags +bitexact -dct fastint -idct simple -y -f pgmyuv -i vsynth1/%02d.pgm
+
+ACL allow localhost
 </Feed>
 
 ##################################################################