From e1621087b6739e9f6e12aae7d59dd99549be384d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Thu, 8 Jul 2010 15:30:25 +0000 Subject: [PATCH] Clean up make rules for calling codec test scripts Originally committed as revision 24112 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index daa657063a..de628aadff 100644 --- a/Makefile +++ b/Makefile @@ -289,28 +289,32 @@ $(LAVF_TESTS) $(LAVFI_TESTS): regtest-ref REFFILE = $(SRC_PATH)/tests/ref/$(1)/$(2:regtest-%=%) RESFILE = tests/data/$(2:regtest-%=%).$(1).regression -define CODECTEST_CMD - $(SRC_PATH)/tests/codec-regression.sh $@ vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" - $(SRC_PATH)/tests/codec-regression.sh $@ vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)" +define VCODECTEST + @echo "TEST VCODEC $(1:regtest-%=%)" + $(SRC_PATH)/tests/codec-regression.sh $(1) vsynth1 tests/vsynth1 "$(TARGET_EXEC)" "$(TARGET_PATH)" + $(SRC_PATH)/tests/codec-regression.sh $(1) vsynth2 tests/vsynth2 "$(TARGET_EXEC)" "$(TARGET_PATH)" +endef + +define ACODECTEST + @echo "TEST ACODEC $(1:regtest-%=%)" + $(SRC_PATH)/tests/codec-regression.sh $(1) acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" endef regtest-ref: regtest-aref regtest-vref regtest-vref: ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm - $(CODECTEST_CMD) + @$(call VCODECTEST,vref) regtest-aref: ffmpeg$(EXESUF) tests/data/asynth1.sw - @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" + @$(call ACODECTEST,aref) $(VCODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF) - @echo "TEST VCODEC $(@:regtest-%=%)" - @$(CODECTEST_CMD) + @$(call VCODECTEST,$@) @diff -u -w $(call REFFILE,vsynth1,$@) $(call RESFILE,vsynth1,$@) @diff -u -w $(call REFFILE,vsynth2,$@) $(call RESFILE,vsynth2,$@) $(ACODEC_TESTS): tests/tiny_psnr$(HOSTEXESUF) - @echo "TEST ACODEC $(@:regtest-%=%)" - @$(SRC_PATH)/tests/codec-regression.sh $@ acodec tests/acodec "$(TARGET_EXEC)" "$(TARGET_PATH)" + @$(call ACODECTEST,$@) @diff -u -w $(call REFFILE,acodec,$@) $(call RESFILE,acodec,$@) $(LAVF_TESTS):