Commit 3ccb441e authored by stefano's avatar stefano

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.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19253 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 048c90d5
...@@ -230,16 +230,16 @@ LAVF_TESTS = $(addprefix regtest-, \ ...@@ -230,16 +230,16 @@ LAVF_TESTS = $(addprefix regtest-, \
pcx \ 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)) ROTOZOOM_RESFILES = $(call RESFILES,rotozoom.regression,$(CODEC_TESTS))
CODEC_VSYNTH = $(call REGFILES,vsynth.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 LAVF_RESFILE = tests/data/lavf.regression
ROTOZOOM_REG = tests/data/rotozoom.regression ROTOZOOM_RESFILE = tests/data/rotozoom.regression
VSYNTH_REG = tests/data/vsynth.regression VSYNTH_RESFILE = tests/data/vsynth.regression
ifneq ($(CONFIG_ZLIB),yes) ifneq ($(CONFIG_ZLIB),yes)
regtest-flashsv codectest: zlib-error regtest-flashsv codectest: zlib-error
...@@ -250,23 +250,23 @@ zlib-error: ...@@ -250,23 +250,23 @@ zlib-error:
@echo @echo
@exit 1 @exit 1
codectest: $(VSYNTH_REG) $(ROTOZOOM_REG) codectest: $(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE)
diff -u -w $(VSYNTH_REFFILE) $(VSYNTH_REG) diff -u -w $(VSYNTH_REFFILE) $(VSYNTH_RESFILE)
diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_REG) diff -u -w $(ROTOZOOM_REFFILE) $(ROTOZOOM_RESFILE)
lavftest: $(LAVF_REG) lavftest: $(LAVF_RESFILE)
diff -u -w $(LAVF_REFFILE) $(LAVF_REG) diff -u -w $(LAVF_REFFILE) $(LAVF_RESFILE)
$(VSYNTH_REG) $(ROTOZOOM_REG) $(LAVF_REG): $(VSYNTH_RESFILE) $(ROTOZOOM_RESFILE) $(LAVF_RESFILE):
cat $^ > $@ cat $^ > $@
$(LAVF_REG): $(LAVF_REGFILES) $(LAVF_RESFILE): $(LAVF_RESFILES)
$(ROTOZOOM_REG): $(CODEC_ROTOZOOM) $(ROTOZOOM_RESFILE): $(ROTOZOOM_RESFILES)
$(VSYNTH_REG): $(CODEC_VSYNTH) $(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 $(CODEC_TESTS) $(LAVF_TESTS): regtest-ref
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment