The ref targets are included in the FATE_[AV]CODEC lists created by configure so they do not need to be listed separately in the makefile. Filter them out when setting dependencies to avoid make warnings about circular deps.
Signed-off-by: Mans Rullgard <[email protected]> --- Yes, I neglected to rerun configure after changing these tests earlier, or I would have noticed this then. Please nail me to that cross over there. --- Makefile | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 479703d..afd783d 100644 --- a/Makefile +++ b/Makefile @@ -193,10 +193,6 @@ REFS = $(AREF) $(VREF) $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm $(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw -fate-acodec-aref: CMD = codectest acodec -fate-vsynth1-vref: CMD = codectest vsynth1 -fate-vsynth2-vref: CMD = codectest vsynth2 - ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @echo @echo "Unfortunately ffserver is broken and therefore its regression" @@ -249,8 +245,8 @@ FATE = $(FATE_ACODEC) \ $(FATE_LAVFI) \ $(FATE_SEEK) \ -$(FATE_ACODEC): $(AREF) -$(FATE_VCODEC): $(VREF) +$(filter-out %-aref,$(FATE_ACODEC)): $(AREF) +$(filter-out %-vref,$(FATE_VCODEC)): $(VREF) $(FATE_LAVF): $(REFS) $(FATE_LAVFI): $(REFS) tools/lavfi-showfiltfmts$(EXESUF) $(FATE_SEEK): fate-codec fate-lavf tests/seek_test$(EXESUF) @@ -284,7 +280,7 @@ FATE_UTILS = base64 tiny_psnr fate: $(FATE) -$(FATE) $(REFS): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) +$(FATE): ffmpeg$(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)' -- 1.7.4.5 _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
