Cosmetics: rename ff_parse_expr() and ff_parse_and_eval_expr() parameters:

[ffmpeg] / Makefile

diff --git a/Makefile b/Makefile
index 48df7670c33c608f33b4bea2133e5fc2c14e149c..027b0adda792082a54c76cbc74d623feec624f4f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -261,6 +261,7 @@ LAVFI_TESTS =           \
     vflip               \
     vflip_crop          \
     vflip_vflip         \
+#   lavfi_pix_fmts      \
 
 ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
 VCODEC_TESTS := $(addprefix regtest-, $(VCODEC_TESTS) $(VCODEC_TESTS-yes))
@@ -309,7 +310,7 @@ $(LAVF_TESTS):
        @$(SRC_PATH)/tests/lavf-regression.sh $@ lavf tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
        @diff -u -w $(call REFFILE,lavf,$@) $(call RESFILE,lavf,$@)
 
-$(LAVFI_TESTS):
+$(LAVFI_TESTS): tools/lavfi-showfiltfmts$(EXESUF)
        @echo "TEST LAVFI $(@:regtest-%=%)"
        @$(SRC_PATH)/tests/lavfi-regression.sh $@ lavfi tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)"
        @diff -u -w $(call REFFILE,lavfi,$@) $(call RESFILE,lavfi,$@)
@@ -339,14 +340,15 @@ tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
 tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
        $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
 
-ifdef SAMPLES
 include $(SRC_PATH_BARE)/tests/fate.mak
+
+ifdef SAMPLES
 fate: $(FATE_TESTS)
-$(FATE_TESTS):
+$(FATE_TESTS): ffmpeg$(EXESUF)
        @echo "TEST FATE   $(@:fate-%=%)"
        @$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)'
 else
-fate:
+fate $(FATE_TESTS):
        @echo "SAMPLES not specified, cannot run FATE"
 endif