From 2795e3573d9407aca8060bdebaeb2119d19587c8 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Mon, 22 Jun 2009 22:56:18 +0000 Subject: [PATCH] Consistently rename variables denoting regression reference file(s) using the _REFFILE(S) postfix, and regression result file(s) using the _RESFILE(S) postfix. Improve legibility. Originally committed as revision 19253 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index f8cc39dbe7..195041e65c 100644 --- a/Makefile +++ b/Makefile @@ -230,16 +230,16 @@ LAVF_TESTS = $(addprefix regtest-, \ pcx \ ) -REGFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%))) +RESFILES = $(addprefix tests/data/,$(addsuffix .$(1),$(2:regtest-%=%))) -CODEC_ROTOZOOM = $(call REGFILES,rotozoom.regression,$(CODEC_TESTS)) -CODEC_VSYNTH = $(call REGFILES,vsynth.regression,$(CODEC_TESTS)) +ROTOZOOM_RESFILES = $(call RESFILES,rotozoom.regression,$(CODEC_TESTS)) +VSYNTH_RESFILES = $(call RESFILES,vsynth.regression,$(CODEC_TESTS)) -LAVF_REGFILES = $(call REGFILES,lavf.regression,$(LAVF_TESTS)) +LAVF_RESFILES = $(call RESFILES,lavf.regression,$(LAVF_TESTS)) -LAVF_REG = tests/data/lavf.regression -ROTOZOOM_REG = tests/data/rotozoom.regression -VSYNTH_REG = tests/data/vsynth.regression +LAVF_RESFILE = tests/data/lavf.regression +ROTOZOOM_RESFILE = tests/data/rotozoom.regression +VSYNTH_RESFILE = tests/data/vsynth.regression ifneq ($(CONFIG_ZLIB),yes) regtest-flashsv codectest: zlib-error @@ -250,23 +250,23 @@ zlib-error: @echo @exit 1 -codectest: $(VSYNTH_REG) $(ROTOZOOM_REG) - diff -u -w $(VSYNTH_REFFILE) $(VSYNTH_REG) - diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG) +codectest: $(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE) + diff -u -w $(VSYNTH_REFFILE) $(VSYNTH_RESFILE) + diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_RESFILE) -lavftest: $(LAVF_REG) - diff -u -w $(LAVF_REFFILE) $(LAVF_REG) +lavftest: $(LAVF_RESFILE) + diff -u -w $(LAVF_REFFILE) $(LAVF_RESFILE) -$(VSYNTH_REG) $(ROTOZOOM_REG) $(LAVF_REG): +$(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE) $(LAVF_RESFILE): cat $^ > $@ -$(LAVF_REG): $(LAVF_REGFILES) -$(ROTOZOOM_REG): $(CODEC_ROTOZOOM) -$(VSYNTH_REG): $(CODEC_VSYNTH) +$(LAVF_RESFILE): $(LAVF_RESFILES) +$(ROTOZOOM_RESFILE): $(ROTOZOOM_RESFILES) +$(VSYNTH_RESFILE): $(VSYNTH_RESFILES) -$(CODEC_VSYNTH) $(CODEC_ROTOZOOM): $(CODEC_TESTS) +$(VSYNTH_RESFILES) $(ROTOZOOM_RESFILES): $(CODEC_TESTS) -$(LAVF_REGFILES): $(LAVF_TESTS) +$(LAVF_RESFILES): $(LAVF_TESTS) $(CODEC_TESTS) $(LAVF_TESTS): regtest-ref