X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=tests%2Fserver-regression.sh;h=8e764410f7fc99006c12cfcd4e16a8dfeb9a922a;hb=542c064d1bae296fc55c3058f3eda72df7879d4d;hp=db1edc11f8f7b879b92683450e34a4dc2ff2da34;hpb=d746f9281f5de2e4e9a8be6b848f1f77d6f4202b;p=ffmpeg

diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index db1edc11f8f..8e764410f7f 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -1,43 +1,47 @@
-#!/bin/bash
+#!/bin/sh
 
 # Make sure that the data directory exists
-mkdir -p data
+mkdir -p tests/data
 
-cp test.conf 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
+#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
 
-FILES=`perl -n -e 'print \$1, " " if /<stream\\s+(\\S+)>/i' data/test.conf`
+FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
 
-rm -f /tmp/feed.ffm
-../ffserver -d -f data/test.conf 2> /dev/null &
+rm -f tests/feed1.ffm
+./ffserver -d -f tests/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 tests/vsynth1/%02d.pgm http://localhost:9999/feed1.ffm 2> /dev/null &
+FFMPEG_PID=$!
+sleep 5
 (
-    cd data || exit $?
+    cd tests/data || exit $?
     rm -f ff-*;
-    WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e debug=off -e server_response=off"
+    WGET_OPTIONS="--user-agent=NSPlayer -q --proxy=off -e verbose=off -e server_response=off"
     for file in $FILES; do
-        if [ `expr match $file "a-*"` -ne 0 ]; then
-            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file > ff-$file &
+        if [ `expr $file : "a-*"` != 0 ]; then
+            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file > ff-$file
         else
-            wget $WGET_OPTIONS --output-document=- http://localhost:9999/$file?date=19700101T000000Z | head --bytes=100000 > ff-$file &
+            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    
+    done
     wait
     # the status page is always different
-    md5sum $MDFILES | grep -v html > ffserver.regression
+    md5sum $MDFILES > ffserver.regression
 )
+kill $FFMPEG_PID
 kill $FFSERVER_PID
 wait > /dev/null 2>&1
-if diff -u data/ffserver.regression $1 ; then
-    echo 
+rm -f tests/feed1.ffm
+if diff -u tests/data/ffserver.regression "$1" ; then
+    echo
     echo Server regression test succeeded.
     exit 0
 else
-    echo 
+    echo
     echo Server regression test: Error.
     exit 1
 fi