* Actually make the sort function do some sorting (data needs to be on own lines)

* Revise the regression results

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

2 files changed, 28 insertions, 28 deletions

diff --git a/tests/ffserver.regression.ref b/tests/ffserver.regression.ref
index 99a10f2f16..c5dae8ad71 100644
--- a/tests/ffserver.regression.ref
+++ b/tests/ffserver.regression.ref
@@ -1,44 +1,44 @@
-a461e8805caa6d3793f163f73ac632ab  ff-test_h.avi
-379020eaa40200e8f09e6e8dc0409ba4  ff-test_l.avi
-25efaa1650a9e16791d4c45f440fbb37  ff-test_h.mpg
-cbfff532fcd765e3976c40b7add94c64  ff-test_l.mpg
-ea506f81b3a28417409c852ea3842dc6  ff-test.swf
-7ea4698fdd7fac1a16d4b99a55350612  ff-test_h.asf
-b02019f2b2c87b35daa35913e759b46d  ff-test_l.asf
-8d887b4f8c99990724718c76f49d1715  ff-test_h.rm
-eaf874a84f6db9407c4edad1760f8760  ff-test_l.rm
-574134f491d5ad8a2cf2c42673f2b29b  ff-test.jpg
-2c6f9f38a860aaa23588bb93d94b673c  ff-test_small.jpg
-4913a7aa7acb917df1817b4b8d1b2356  ff-test.mjpg
 ad56436a2fc29b0a55d3a62489942b0d  ff-a-ac3.rm
-94f2f61e8659be78fa0f2bc6754737ee  ff-a-h263.avi
-04c7bc584ad25b96f759b8cfd5404b60  ff-a-h263p.avi
-e770f6a63bc6cf5647499c5a9be0a675  ff-a-huffyuv.avi
-3df0c33223dbf896760fc172c26e4e99  ff-a-mjpeg.avi
-21f8ff9f1daacd9133683bb4ea0f50a4  ff-a-mp2.mp2
-9ab166f4abec4d9ba87b3c643276646e  ff-a-mpeg1b.mpg
-2f67a20f4e2d122054ba4d2eb4e234fd  ff-a-mpeg1.mpg
-8ddec0df3b7b189ed93a83dcaf1da80d  ff-a-mpeg4-adv.avi
-2aa1de5c814160fdf4ccb1340bc64b14  ff-a-mpeg4-rc.avi
-1019dd8a6b47f9ddf82b3b462da18a45  ff-a-msmpeg4.avi
-c0fcf607b3c7671269a43fc4d9fda6c9  ff-a-msmpeg4v2.avi
-230824defe495692532ac1ee0f0a5923  ff-a-odivx.avi
-06fecb22d2b7570121ce342f09f58000  ff-a-rv10.rm
-e3ad78406c4e84a74ef64bfc819aff7b  ff-a-wmv1.avi
-a49f6b185a5e76e82013d944b3aa51c4  ff-a-wmv2.avi
 8b40455c66bcc5d2d9d7fabe2a907c68  ff-a-ac3.rm.asf
+94f2f61e8659be78fa0f2bc6754737ee  ff-a-h263.avi
 961eef00cacc72023ccb7c0ccd45b01a  ff-a-h263.avi.asf
+04c7bc584ad25b96f759b8cfd5404b60  ff-a-h263p.avi
 769f66c899f803313eddc3b1ca615838  ff-a-h263p.avi.asf
+e770f6a63bc6cf5647499c5a9be0a675  ff-a-huffyuv.avi
 badd655491442b9a0d9c71ccca62631c  ff-a-huffyuv.avi.asf
+3df0c33223dbf896760fc172c26e4e99  ff-a-mjpeg.avi
 429749940ed2028a60c6a8e10d125279  ff-a-mjpeg.avi.asf
+21f8ff9f1daacd9133683bb4ea0f50a4  ff-a-mp2.mp2
 c593b98f0970f7d4ae2be3a7e82aa0f7  ff-a-mp2.mp2.asf
+9ab166f4abec4d9ba87b3c643276646e  ff-a-mpeg1b.mpg
 fc49dd5c8fcca8692da120c047608286  ff-a-mpeg1b.mpg.asf
+2f67a20f4e2d122054ba4d2eb4e234fd  ff-a-mpeg1.mpg
 dec5676b79535bb87c268d0633fc37f1  ff-a-mpeg1.mpg.asf
+8ddec0df3b7b189ed93a83dcaf1da80d  ff-a-mpeg4-adv.avi
 0d9bfd72cb03fcc7ba710040df5aee82  ff-a-mpeg4-adv.avi.asf
+2aa1de5c814160fdf4ccb1340bc64b14  ff-a-mpeg4-rc.avi
 2f15bf508e0a55fffbd34c62e1bda8f3  ff-a-mpeg4-rc.avi.asf
+1019dd8a6b47f9ddf82b3b462da18a45  ff-a-msmpeg4.avi
 7de436541a61169c64bb9b3973813aa9  ff-a-msmpeg4.avi.asf
+c0fcf607b3c7671269a43fc4d9fda6c9  ff-a-msmpeg4v2.avi
 eb0a4e4d51a7595dcaf7678dc3439fc7  ff-a-msmpeg4v2.avi.asf
+230824defe495692532ac1ee0f0a5923  ff-a-odivx.avi
 130bebe6f4c218b36945aafd9a3b037f  ff-a-odivx.avi.asf
+06fecb22d2b7570121ce342f09f58000  ff-a-rv10.rm
 b5972d167cddd0dc1204feddfcea35fd  ff-a-rv10.rm.asf
+e3ad78406c4e84a74ef64bfc819aff7b  ff-a-wmv1.avi
 cb18df1d019f3a8e8615eec58e357e15  ff-a-wmv1.avi.asf
+a49f6b185a5e76e82013d944b3aa51c4  ff-a-wmv2.avi
 6b23082933279132bd9a6cf97fbd5ee0  ff-a-wmv2.avi.asf
+7ea4698fdd7fac1a16d4b99a55350612  ff-test_h.asf
+a461e8805caa6d3793f163f73ac632ab  ff-test_h.avi
+25efaa1650a9e16791d4c45f440fbb37  ff-test_h.mpg
+8d887b4f8c99990724718c76f49d1715  ff-test_h.rm
+574134f491d5ad8a2cf2c42673f2b29b  ff-test.jpg
+b02019f2b2c87b35daa35913e759b46d  ff-test_l.asf
+379020eaa40200e8f09e6e8dc0409ba4  ff-test_l.avi
+cbfff532fcd765e3976c40b7add94c64  ff-test_l.mpg
+eaf874a84f6db9407c4edad1760f8760  ff-test_l.rm
+4913a7aa7acb917df1817b4b8d1b2356  ff-test.mjpg
+2c6f9f38a860aaa23588bb93d94b673c  ff-test_small.jpg
+ea506f81b3a28417409c852ea3842dc6  ff-test.swf
diff --git a/tests/server-regression.sh b/tests/server-regression.sh
index 8251999b2a..e83df6041c 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 | sort`
+FILES=`perl -n -e 'print \$1, "\n" if /<stream\\s+(\\S+)>/i' data/test.conf | sort`
 
 rm -f /tmp/feed.ffm
 ../ffserver -d -f data/test.conf 2> /dev/null &