From 70378ea1902b57ccb221157fbd3a411d11046ad0 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 18 May 2011 13:05:39 +0100 Subject: fate: run aref and vref as regular tests These tests create reference files used for psnr calculation in the other codec tests. Treating them as (mostly) regular tests simplifies the makefile and makes them visible in the fate reports. The latter makes errors in these runs easier to identify. Signed-off-by: Mans Rullgard --- Makefile | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d69004b474..a155eea58b 100644 --- a/Makefile +++ b/Makefile @@ -187,18 +187,16 @@ lavftest: fate-lavf lavfitest: fate-lavfi seektest: fate-seek -AREF = tests/data/acodec.ref.wav -VREF = tests/data/vsynth1.ref.yuv +AREF = fate-acodec-aref +VREF = fate-vsynth1-vref fate-vsynth2-vref REFS = $(AREF) $(VREF) -$(REFS): TAG = GEN - $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm - $(M)$(SRC_PATH)/tests/codec-regression.sh vref vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" - $(Q)$(SRC_PATH)/tests/codec-regression.sh vref vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)" - $(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw - $(M)$(SRC_PATH)/tests/codec-regression.sh aref acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" + +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 @@ -287,7 +285,7 @@ FATE_UTILS = base64 tiny_psnr fate: $(FATE) -$(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) +$(FATE) $(REFS): 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)' -- cgit v1.2.3 From 164c24c858047f304a81278615409503c6a7da17 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 18 May 2011 17:23:47 +0100 Subject: fate: remove redundant aref and vref references 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 --- Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a155eea58b..0ed6207961 100644 --- a/Makefile +++ b/Makefile @@ -194,10 +194,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" @@ -250,8 +246,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) @@ -285,7 +281,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)' -- cgit v1.2.3 From f907ad9b85d5e08e4a024e24734181940cd4fc48 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 18 May 2011 17:13:15 +0100 Subject: Remove unused make variable SEEK_REFFILE Signed-off-by: Mans Rullgard --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0ed6207961..afd783da5b 100644 --- a/Makefile +++ b/Makefile @@ -180,7 +180,6 @@ check: test checkheaders fulltest test: codectest lavftest lavfitest seektest FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref -SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref codectest: fate-codec lavftest: fate-lavf -- cgit v1.2.3