update rotozoom regression ref after patches r5945-r5950

[ffmpeg] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 2c4762d80f57678782422b285a0d6553e182a399..84302cc22a2f1ea7bacb003e72b1c292e9a10ae3 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -6,38 +6,59 @@ include ../config.mak
 
 VPATH=$(SRC_PATH)/tests
 CFLAGS=-O2 -Wall -g
-REFFILE=$(SRC_PATH)/tests/ffmpeg.regression.ref
-LIBAV_REFFILE=$(SRC_PATH)/tests/libav.regression.ref
 
-all: test
+REFFILE1=$(SRC_PATH)/tests/ffmpeg.regression.ref
+REFFILE2=$(SRC_PATH)/tests/rotozoom.regression.ref
+
+SERVER_REFFILE=$(VPATH)/ffserver.regression.ref
+
+LIBAV_REFFILE=$(VPATH)/libav.regression.ref
+
+all fulltest: codectest libavtest test-server
+test: codectest libavtest test-server
+
+test-server: vsynth1/0.pgm asynth1.sw
+       @$(VPATH)/server-regression.sh $(SERVER_REFFILE) $(VPATH)/test.conf
 
 # fast regression tests for all codecs
-test mpeg4 mpeg: vsynth1/0.pgm asynth1.sw
-       @$(SRC_PATH)/tests/regression.sh $@ $(REFFILE)
+codectest mpeg4 mpeg ac3 snow snowll: vsynth1/0.pgm vsynth2/0.pgm asynth1.sw tiny_psnr$(EXESUF)
+       @$(VPATH)/regression.sh $@ $(REFFILE1) vsynth1
+       @$(VPATH)/regression.sh $@ $(REFFILE2) vsynth2
 
 # fast regression for libav formats
 libavtest: vsynth1/0.pgm asynth1.sw
-       @$(SRC_PATH)/tests/regression.sh $@ $(LIBAV_REFFILE)
+       @$(VPATH)/regression.sh $@ $(LIBAV_REFFILE) vsynth1
 
 # video generation
 
-vsynth1/0.pgm: videogen
+vsynth1/0.pgm: videogen$(EXESUF)
        @mkdir -p vsynth1
        ./videogen 'vsynth1/'
 
-videogen: videogen.c
+vsynth2/0.pgm: rotozoom$(EXESUF)
+       @mkdir -p vsynth2
+       ./rotozoom 'vsynth2/' $(VPATH)/lena.pnm
+
+videogen$(EXESUF): videogen.c
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+
+rotozoom$(EXESUF): rotozoom.c
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
 # audio generation
 
-asynth1.sw: audiogen
+asynth1.sw: audiogen$(EXESUF)
        ./audiogen $@
 
-audiogen: audiogen.c
+audiogen$(EXESUF): audiogen.c
+       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+
+tiny_psnr$(EXESUF): tiny_psnr.c
        $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
 DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
  $(SRC_PATH)/libavcodec/i386/dsputil_mmx_avg.h \
+ $(SRC_PATH)/libavcodec/i386/dsputil_mmx_rnd.h \
  $(SRC_PATH)/libavcodec/i386/fdct_mmx.c \
  $(SRC_PATH)/libavcodec/i386/idct_mmx.c \
  $(SRC_PATH)/libavcodec/i386/motion_est_mmx.c \
@@ -47,10 +68,14 @@ DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
  $(SRC_PATH)/libavcodec/simple_idct.c
 
 dsptestpic: dsptest.c $(DSPDEPS)
-       $(CC) -fPIC -DPIC -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
+       $(CC) -fPIC -DPIC -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. \
+              -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ \
+              -o $@ $< -lm
 dsptest: dsptest.c $(DSPDEPS)
-       $(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ -o $@ $< -lm
+       $(CC) -O4 -fomit-frame-pointer -DHAVE_AV_CONFIG_H -I.. \
+              -I$(SRC_PATH)/libavcodec/i386 -I$(SRC_PATH)/libavcodec/ \
+              -o $@ $< -lm
 
-clean:
-       rm -rf vsynth1
-       rm -f asynth1.sw *~ audiogen videogen
+distclean clean:
+       rm -rf vsynth1 vsynth2 data
+       rm -f asynth1.sw *~ audiogen$(EXESUF) videogen$(EXESUF) rotozoom$(EXESUF) tiny_psnr$(EXESUF)