adpcmenc: fix QT IMA ADPCM encoder

[ffmpeg] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index e6640b35dd12052a6b4fa304f1960b88c4a17b0e..b511a9a118643d6c7d4c498476fbe574e5dd973b 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,18 +1,9 @@
-FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
-
 AREF = fate-acodec-aref
 VREF = fate-vsynth1-vref fate-vsynth2-vref
 REFS = $(AREF) $(VREF)
 
-$(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
-$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw
-
-ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
-       @echo
-       @echo "Unfortunately ffserver is broken and therefore its regression"
-       @echo "test fails randomly. Treat the results accordingly."
-       @echo
-       $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
+$(VREF): avconv$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
+$(AREF): avconv$(EXESUF) tests/data/asynth1.sw
 
 tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
        @mkdir -p tests/vsynth1
@@ -28,12 +19,6 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
 
 tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN
 
-tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
-       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
-
-tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS)
-       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
-
 include $(SRC_PATH)/tests/fate.mak
 include $(SRC_PATH)/tests/fate2.mak
 
@@ -41,8 +26,10 @@ include $(SRC_PATH)/tests/fate/aac.mak
 include $(SRC_PATH)/tests/fate/als.mak
 include $(SRC_PATH)/tests/fate/amrnb.mak
 include $(SRC_PATH)/tests/fate/amrwb.mak
+include $(SRC_PATH)/tests/fate/dct.mak
 include $(SRC_PATH)/tests/fate/fft.mak
 include $(SRC_PATH)/tests/fate/h264.mak
+include $(SRC_PATH)/tests/fate/libavutil.mak
 include $(SRC_PATH)/tests/fate/mp3.mak
 include $(SRC_PATH)/tests/fate/vorbis.mak
 include $(SRC_PATH)/tests/fate/vp8.mak
@@ -62,10 +49,11 @@ FATE = $(FATE_ACODEC)                                                   \
        $(FATE_SEEK)                                                     \
 
 $(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
-$(filter-out %-vref,$(FATE_VCODEC)): $(VREF)
+$(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref
+$(filter-out %-vref,$(FATE_VSYNTH2)): fate-vsynth2-vref
 $(FATE_LAVF):   $(REFS)
 $(FATE_LAVFI):  $(REFS) tools/lavfi-showfiltfmts$(EXESUF)
-$(FATE_SEEK):   fate-codec fate-lavf tests/seek_test$(EXESUF)
+$(FATE_SEEK):   fate-codec fate-lavf libavformat/seek-test$(EXESUF)
 
 $(FATE_ACODEC):  CMD = codectest acodec
 $(FATE_VSYNTH1): CMD = codectest vsynth1
@@ -96,7 +84,7 @@ FATE_UTILS = base64 tiny_psnr
 
 fate: $(FATE)
 
-$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
+$(FATE): avconv$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
        @echo "TEST    $(@:fate-%=%)"
        $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)'
 
@@ -108,7 +96,6 @@ clean:: testclean
 testclean:
        $(RM) -r tests/vsynth1 tests/vsynth2 tests/data
        $(RM) $(CLEANSUFFIXES:%=tests/%)
-       $(RM) tests/seek_test$(EXESUF) tests/seek_test.o
        $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
 
 -include $(wildcard tests/*.d)