projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce8f4fb
)
fix servertest in out of tree builds
author
Måns Rullgård
<mans@mansr.com>
Mon, 2 Jun 2008 22:56:58 +0000
(22:56 +0000)
committer
Måns Rullgård
<mans@mansr.com>
Mon, 2 Jun 2008 22:56:58 +0000
(22:56 +0000)
Originally committed as revision 13631 to svn://svn.ffmpeg.org/ffmpeg/trunk
tests/server-regression.sh
patch
|
blob
|
history
diff --git
a/tests/server-regression.sh
b/tests/server-regression.sh
index 9a150ca9e4df9892d4c1e9b93de5135781906c5a..2f8a7a8f4104818894e547151664b0ab508dd9a8 100755
(executable)
--- a/
tests/server-regression.sh
+++ b/
tests/server-regression.sh
@@
-9,7
+9,7
@@
mkdir -p tests/data
FILES=`sed -n 's/^[^#]*<Stream \(.*\)>.*/\1/p' $2 | grep -v html`
rm -f tests/feed1.ffm
-./ffserver -d -f
tests/test.conf
2> /dev/null &
+./ffserver -d -f
"$2"
2> /dev/null &
FFSERVER_PID=$!
echo "Waiting for feeds to startup..."
sleep 2