From a12eea308a7ad9b97d45cf3a93f9d7f08e93269c Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Wed, 16 Jul 2003 19:13:33 +0000 Subject: [PATCH] put b- prefix to libav tests to avoid incorrect ffserver test Originally committed as revision 2055 to svn://svn.ffmpeg.org/ffmpeg/trunk --- tests/Makefile | 2 +- tests/libav.regression.ref | 98 +++++++++++++++++++------------------- tests/regression.sh | 3 +- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index dd1db98825..398651995a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -14,7 +14,7 @@ SERVER_REFFILE=$(SRC_PATH)/tests/ffserver.regression.ref LIBAV_REFFILE=$(SRC_PATH)/tests/libav.regression.ref -all: test libavtest test-server +all fulltest: test libavtest test-server test-server: vsynth1/0.pgm asynth1.sw @$(SRC_PATH)/tests/server-regression.sh $(SERVER_REFFILE) $(SRC_PATH)/tests/test.conf diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index f8f95cd929..20035b9f36 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -1,50 +1,50 @@ ffmpeg regression test -55e7e5626717ced8d8709c43bd669fc1 *./data/a-libav.avi -./data/a-libav.avi CRC=665adc14 -f34176ef4f8577c93d51d7c403c8776d *./data/a-libav.asf -./data/a-libav.asf CRC=cf51c3de -59c71a1bef09beb4a4e6f203967d12de *./data/a-libav.rm -271603c17313031c17d424364f33f86f *./data/a-libav.mpg -./data/a-libav.mpg CRC=a892f96f -976a303a3f2f3c262d52b6dd5e744328 *./data/a-libav.swf -./data/a-libav.swf CRC=d813a4a6 -3d0ea8f9cc0f9c4ed096381de3ab7d53 *./data/a-libav.ffm -./data/a-libav.ffm CRC=2a4bfa20 -b2c9ee08b47bc840e29f2e9fdffe9825 *./data/a-libav.flv -./data/a-libav.flv CRC=e2e5bc81 -9a9da315747599f7718cc9a9a09c21ff *./data/a-libav.pbm -./data/a-libav.pbm CRC=a1057fd1 -6ea0e1faf08f6fcdb44db4a104361b57 *./data/a-libav.pgm -./data/a-libav.pgm CRC=f4aa7c47 -0c5fe86621b7377705837f304d4ba1e9 *./data/a-libav.ppm -./data/a-libav.ppm CRC=b2bb8e92 -1cac531652ea2ff2fb141d5ae992caa8 *./data/a-libav.gif -bf66705fbeee5355d8ff021d1e88fa6f *./data/a-libav.yuv4mpeg -./data/a-libav%d.pgm CRC=84c09106 -./data/a-libav%d.ppm CRC=25c06ecf -4b7690747c49e4e8e910359768e4a77e *./data/a-libav.wav -./data/a-libav.wav CRC=2a09519c -e2a6d6fae17394dfe87cb5bb8ae11837 *./data/a-libav.al -./data/a-libav.al CRC=efdf94c3 -4574d7e2c09e1e13663e61bd2889f12d *./data/a-libav.ul -./data/a-libav.ul CRC=6064b2f8 -7a21ff174e3cca1702e0826c4ca0eccf *./data/a-libav.au -./data/a-libav.au CRC=2a09519c -ce356ce2708cb6033ab5d762da93cfd4 *./data/a-libav-yuv420p.yuv -ce356ce2708cb6033ab5d762da93cfd4 *./data/a-libav-yuv422p.yuv -ce356ce2708cb6033ab5d762da93cfd4 *./data/a-libav-yuv444p.yuv -ce356ce2708cb6033ab5d762da93cfd4 *./data/a-libav-yuv422.yuv -545f61c353a8b4419808785cb4f0069d *./data/a-libav-yuv410p.yuv -d6c03f930018ff859bd43f52b92e9321 *./data/a-libav-yuv411p.yuv -14117c4d7956775a7bbceabfc38da808 *./data/a-libav-yuvj420p.yuv -14117c4d7956775a7bbceabfc38da808 *./data/a-libav-yuvj422p.yuv -14117c4d7956775a7bbceabfc38da808 *./data/a-libav-yuvj444p.yuv -deb2f7ebe297df2c1fe264d19b34d2fb *./data/a-libav-rgb24.yuv -deb2f7ebe297df2c1fe264d19b34d2fb *./data/a-libav-bgr24.yuv -deb2f7ebe297df2c1fe264d19b34d2fb *./data/a-libav-rgba32.yuv -5d395f62bff8ac475f743268c772ca3a *./data/a-libav-rgb565.yuv -2ffd6871fcbfe9570454e8703ac8ea01 *./data/a-libav-rgb555.yuv -0b62dcf9b57b294dbaa5d9e99b1ee192 *./data/a-libav-gray.yuv -d5a686494c2ded1d211937ef8e22b56b *./data/a-libav-monow.yuv -d5a686494c2ded1d211937ef8e22b56b *./data/a-libav-monob.yuv -7a319375916cae4e691ecb74295e5d2a *./data/a-libav-pal8.yuv +55e7e5626717ced8d8709c43bd669fc1 *./data/b-libav.avi +./data/b-libav.avi CRC=665adc14 +f34176ef4f8577c93d51d7c403c8776d *./data/b-libav.asf +./data/b-libav.asf CRC=cf51c3de +59c71a1bef09beb4a4e6f203967d12de *./data/b-libav.rm +271603c17313031c17d424364f33f86f *./data/b-libav.mpg +./data/b-libav.mpg CRC=a892f96f +976a303a3f2f3c262d52b6dd5e744328 *./data/b-libav.swf +./data/b-libav.swf CRC=d813a4a6 +3d0ea8f9cc0f9c4ed096381de3ab7d53 *./data/b-libav.ffm +./data/b-libav.ffm CRC=2a4bfa20 +b2c9ee08b47bc840e29f2e9fdffe9825 *./data/b-libav.flv +./data/b-libav.flv CRC=e2e5bc81 +9a9da315747599f7718cc9a9a09c21ff *./data/b-libav.pbm +./data/b-libav.pbm CRC=a1057fd1 +6ea0e1faf08f6fcdb44db4a104361b57 *./data/b-libav.pgm +./data/b-libav.pgm CRC=f4aa7c47 +0c5fe86621b7377705837f304d4ba1e9 *./data/b-libav.ppm +./data/b-libav.ppm CRC=b2bb8e92 +1cac531652ea2ff2fb141d5ae992caa8 *./data/b-libav.gif +bf66705fbeee5355d8ff021d1e88fa6f *./data/b-libav.yuv4mpeg +./data/b-libav%d.pgm CRC=84c09106 +./data/b-libav%d.ppm CRC=25c06ecf +4b7690747c49e4e8e910359768e4a77e *./data/b-libav.wav +./data/b-libav.wav CRC=2a09519c +e2a6d6fae17394dfe87cb5bb8ae11837 *./data/b-libav.al +./data/b-libav.al CRC=efdf94c3 +4574d7e2c09e1e13663e61bd2889f12d *./data/b-libav.ul +./data/b-libav.ul CRC=6064b2f8 +7a21ff174e3cca1702e0826c4ca0eccf *./data/b-libav.au +./data/b-libav.au CRC=2a09519c +ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuv420p.yuv +ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuv422p.yuv +ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuv444p.yuv +ce356ce2708cb6033ab5d762da93cfd4 *./data/b-libav-yuv422.yuv +545f61c353a8b4419808785cb4f0069d *./data/b-libav-yuv410p.yuv +d6c03f930018ff859bd43f52b92e9321 *./data/b-libav-yuv411p.yuv +14117c4d7956775a7bbceabfc38da808 *./data/b-libav-yuvj420p.yuv +14117c4d7956775a7bbceabfc38da808 *./data/b-libav-yuvj422p.yuv +14117c4d7956775a7bbceabfc38da808 *./data/b-libav-yuvj444p.yuv +deb2f7ebe297df2c1fe264d19b34d2fb *./data/b-libav-rgb24.yuv +deb2f7ebe297df2c1fe264d19b34d2fb *./data/b-libav-bgr24.yuv +deb2f7ebe297df2c1fe264d19b34d2fb *./data/b-libav-rgba32.yuv +5d395f62bff8ac475f743268c772ca3a *./data/b-libav-rgb565.yuv +2ffd6871fcbfe9570454e8703ac8ea01 *./data/b-libav-rgb555.yuv +0b62dcf9b57b294dbaa5d9e99b1ee192 *./data/b-libav-gray.yuv +d5a686494c2ded1d211937ef8e22b56b *./data/b-libav-monow.yuv +d5a686494c2ded1d211937ef8e22b56b *./data/b-libav-monob.yuv +7a319375916cae4e691ecb74295e5d2a *./data/b-libav-pal8.yuv diff --git a/tests/regression.sh b/tests/regression.sh index bd58f8ecbb..b15ff9a1ef 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -17,6 +17,7 @@ set -e datadir="./data" logfile="$datadir/ffmpeg.regression" +outfile="$datadir/a-" # tests to do if [ "$1" = "mpeg4" ] ; then @@ -28,6 +29,7 @@ elif [ "$1" = "ac3" ] ; then elif [ "$1" = "libavtest" ] ; then do_libav=y logfile="$datadir/libav.regression" + outfile="$datadir/b-" else do_mpeg=y do_msmpeg4v2=y @@ -54,7 +56,6 @@ fi # various files ffmpeg="../ffmpeg_g" tiny_psnr="./tiny_psnr" -outfile="$datadir/a-" reffile="$2" benchfile="$datadir/ffmpeg.bench" raw_src="$3/%d.pgm"