summaryrefslogtreecommitdiff
path: root/tests/server-regression.sh
diff options
context:
space:
mode:
authorPhilip Gladstone <philipjsg@users.sourceforge.net>2003-04-15 01:58:46 +0000
committerPhilip Gladstone <philipjsg@users.sourceforge.net>2003-04-15 01:58:46 +0000
commite31c1c30d20510dd1558e4b55bfe192c474bf519 (patch)
tree4a2cfc00a4b2a3263270961e1075e013dbb747dc /tests/server-regression.sh
parent129dfab2c709b0b2881687bf04ca73a139587029 (diff)
* Removed ffmpeg output during encoding runs. Now only print out errors
* Try to fix mysterious sort order issue in ffserver tests Originally committed as revision 1775 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests/server-regression.sh')
-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 db1edc11f8..8251999b2a 100755
--- a/tests/server-regression.sh
+++ b/tests/server-regression.sh
@@ -7,7 +7,7 @@ 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
-FILES=`perl -n -e 'print \$1, " " if /<stream\\s+(\\S+)>/i' data/test.conf`
+FILES=`perl -n -e 'print \$1, " " if /<stream\\s+(\\S+)>/i' data/test.conf | sort`
rm -f /tmp/feed.ffm
../ffserver -d -f data/test.conf 2> /dev/null &