Merge remote-tracking branch 'qatar/master'

[ffmpeg] / tests / Makefile

diff --git a/tests/Makefile b/tests/Makefile
index 5c65237b440427ed269d0b6b64e93a2733ddeaa3..d9856dcd651fde8762c598c0c1180c5af972fbf8 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,9 +1,18 @@
+FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
+
 AREF = fate-acodec-aref
 VREF = fate-vsynth1-vref fate-vsynth2-vref
 REFS = $(AREF) $(VREF)
 
-$(VREF): avconv$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
-$(AREF): avconv$(EXESUF) tests/data/asynth1.sw
+$(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
 
 OBJDIRS += tests/data tests/vsynth1 tests/vsynth2
 
@@ -19,7 +28,15 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data
 tests/data/asynth-16000-1.sw: tests/audiogen$(HOSTEXESUF) | tests/data
        $(M)./$< $@ 16000 1
 
-tests/data/asynth%.sw tests/vsynth%/00.pgm: TAG = GEN
+tests/data/mapchan-6ch.sw: tests/audiogen$(HOSTEXESUF)
+       @mkdir -p tests/data
+       $(M)./$< $@ 22050 6
+
+tests/data/mapchan-mono.sw: tests/audiogen$(HOSTEXESUF)
+       @mkdir -p tests/data
+       $(M)./$< $@ 22050 1
+
+tests/data/%.sw tests/vsynth%/00.pgm: TAG = GEN
 
 include $(SRC_PATH)/tests/fate/aac.mak
 include $(SRC_PATH)/tests/fate/ac3.mak
@@ -41,6 +58,7 @@ include $(SRC_PATH)/tests/fate/image.mak
 include $(SRC_PATH)/tests/fate/indeo.mak
 include $(SRC_PATH)/tests/fate/libavcodec.mak
 include $(SRC_PATH)/tests/fate/libavutil.mak
+include $(SRC_PATH)/tests/fate/mapchan.mak
 include $(SRC_PATH)/tests/fate/lossless-audio.mak
 include $(SRC_PATH)/tests/fate/lossless-video.mak
 include $(SRC_PATH)/tests/fate/microsoft.mak
@@ -65,6 +83,7 @@ FATE_ACODEC  = $(ACODEC_TESTS:%=fate-acodec-%)
 FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%)
 FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%)
 FATE_VCODEC  = $(FATE_VSYNTH1) $(FATE_VSYNTH2)
+FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%)
 FATE_LAVF    = $(LAVF_TESTS:%=fate-lavf-%)
 FATE_LAVFI   = $(LAVFI_TESTS:%=fate-lavfi-%)
 FATE_SEEK    = $(SEEK_TESTS:seek_%=fate-seek-%)
@@ -88,6 +107,7 @@ $(FATE_SEEK):   fate-codec fate-lavf libavformat/seek-test$(EXESUF)
 $(FATE_ACODEC):  CMD = codectest acodec
 $(FATE_VSYNTH1): CMD = codectest vsynth1
 $(FATE_VSYNTH2): CMD = codectest vsynth2
+$(FATE_LAVF_FATE): CMD = lavffatetest
 $(FATE_LAVF):    CMD = lavftest
 $(FATE_LAVFI):   CMD = lavfitest
 $(FATE_SEEK):    CMD = seektest
@@ -95,15 +115,19 @@ $(FATE_SEEK):    CMD = seektest
 fate-codec:  fate-acodec fate-vcodec
 fate-acodec: $(FATE_ACODEC)
 fate-vcodec: $(FATE_VCODEC)
+fate-lavf-fate: $(FATE_LAVF_FATE)
 fate-lavf:   $(FATE_LAVF)
 fate-lavfi:  $(FATE_LAVFI)
 fate-seek:   $(FATE_SEEK)
 
 ifdef SAMPLES
+FATE += $(FATE_LAVF_FATE)
 FATE += $(FATE_TESTS) $(FATE_TESTS-yes)
 fate-rsync:
-       rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES)
+       rsync -vaLW --timeout=60 --contimeout=60 rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES)
 else
+fate::
+       @echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"
 fate-rsync:
        @echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
 $(FATE_TESTS):
@@ -112,9 +136,11 @@ endif
 
 FATE_UTILS = base64 tiny_psnr
 
-fate: $(FATE)
+TOOL = ffmpeg
+
+fate:: $(FATE)
 
-$(FATE): avconv$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
+$(FATE): $(TOOL)$(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)' '$(CPUFLAGS)'
 
@@ -124,7 +150,7 @@ fate-list:
 clean:: testclean
 
 testclean:
-       $(RM) -r tests/vsynth1 tests/vsynth2 tests/data
+       $(RM) -r tests/vsynth1 tests/vsynth2 tests/data tools/lavfi-showfiltfmts$(EXESUF)
        $(RM) $(CLEANSUFFIXES:%=tests/%)
        $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))