aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-06-07 21:36:58 +0000
committerDiego Biurrun <diego@biurrun.de>2007-06-07 21:36:58 +0000
commit46076a95a05a8862315df1f6f8e1db313f80c343 (patch)
tree119cfb532e5fb12778c2b4e02fdc9e498b4b0e91
parentbcbd6603dd805e9a56c90493a6a84a96d1066b05 (diff)
downloadffmpeg-46076a95a05a8862315df1f6f8e1db313f80c343.tar.gz
The server configuration file is passed as a command line parameter.
Originally committed as revision 9254 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xtests/server-regression.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index 1f561aa544..290afd0ce7 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -13,7 +13,7 @@ mkdir -p data
#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' test.conf | grep -v html`
+FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
rm -f feed1.ffm
../ffserver -d -f test.conf 2> /dev/null &