From 9770a7ad0e0badf4b7cbe2c23b7522ca5b187ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Thu, 8 Jul 2010 18:44:08 +0000 Subject: [PATCH] Simplify regtest reference makefile dependencies Originally committed as revision 24121 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 5c656dce82..0040bd18b8 100644 --- a/Makefile +++ b/Makefile @@ -201,16 +201,17 @@ codectest: $(CODEC_TESTS) lavftest: $(LAVF_TESTS) lavfitest: $(LAVFI_TESTS) -$(ACODEC_TESTS): regtest-aref -$(VCODEC_TESTS): regtest-vref -$(LAVF_TESTS) $(LAVFI_TESTS): regtest-ref +AREF = tests/data/acodec.ref.wav +VREF = tests/data/vsynth1.ref.yuv +REFS = $(AREF) $(VREF) + +$(ACODEC_TESTS): $(AREF) +$(VCODEC_TESTS): $(VREF) +$(LAVF_TESTS) $(LAVFI_TESTS): $(REFS) REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%) RESFILE = tests/data/$(2:regtest-%=%).$(1).regression -AREF = tests/data/acodec.ref.wav -VREF = tests/data/vsynth1.ref.yuv tests/data/vsynth2.ref.yuv - define VCODECTEST @echo "TEST VCODEC $(1:regtest-%=%)" $(SRC_PATH)/tests/codec-regression.sh $(1) vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" @@ -222,10 +223,6 @@ define ACODECTEST $(SRC_PATH)/tests/codec-regression.sh $(1) acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" endef -regtest-ref: regtest-aref regtest-vref -regtest-aref: $(AREF) -regtest-vref: $(VREF) - $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm @$(call VCODECTEST,vref)