[FFmpeg-devel] [PATCH] fate: warn if SAMPLES is not specified.

Clément Bœsch ubitux at gmail.com
Fri Dec 23 00:33:49 CET 2011


On Thu, Dec 22, 2011 at 11:42:50PM +0100, Reimar Döffinger wrote:
> On Thu, Dec 22, 2011 at 04:23:05PM +0100, Clément Bœsch wrote:
> > ---
> >  tests/Makefile |    6 ++++--
> >  1 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tests/Makefile b/tests/Makefile
> > index b44db7d..d825cd8 100644
> > --- a/tests/Makefile
> > +++ b/tests/Makefile
> > @@ -108,9 +108,13 @@ fate-seek:   $(FATE_SEEK)
> >  
> >  ifdef SAMPLES
> >  FATE += $(FATE_TESTS) $(FATE_TESTS-yes)
> > +fate: $(FATE)
> >  fate-rsync:
> >  	rsync -vaLW --timeout=60 --contimeout=60 rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES)
> >  else
> > +fate-samples-warning:
> > +	@echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"
> > +fate: fate-samples-warning $(FATE)
> >  fate-rsync:
> >  	@echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
> >  $(FATE_TESTS):
> > @@ -121,8 +125,6 @@ FATE_UTILS = base64 tiny_psnr
> >  
> >  TOOL = ffmpeg
> >  
> > -fate: $(FATE)
> > -
> 
> Hm, I don't think that should be necessary to change, just specifying
> the additional fate-samples-warning dependency should work.
> However particularly with -j <n> it can be printed whenever.
> (I am not completely sure about the ':' vs. '::' syntax, might be you
> have to switch to using ::, but at least duplicating it completely
> should not be necessary).
> Alternatively you could just do a
> FATE += fate-samples-warning
> but that would probably print it at the end - whether that is better or
> worse would be up to discussion.

See new attached patch. The "fate: $(FATE)" line needed to be changed
using '::', or it wouldn't work.

-- 
Clément B.
-------------- next part --------------
From 72fad0fa6daedf6dcafc89e1272aad0cac819bd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux at gmail.com>
Date: Thu, 22 Dec 2011 16:22:48 +0100
Subject: [PATCH] fate: warn if SAMPLES is not specified.

---
 tests/Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index b44db7d..6ac4928 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -111,6 +111,8 @@ FATE += $(FATE_TESTS) $(FATE_TESTS-yes)
 fate-rsync:
 	rsync -vaLW --timeout=60 --contimeout=60 rsync://fate.ffmpeg.org/fate-suite/ $(SAMPLES)
 else
+fate::
+	@echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"
 fate-rsync:
 	@echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
 $(FATE_TESTS):
@@ -121,7 +123,7 @@ FATE_UTILS = base64 tiny_psnr
 
 TOOL = ffmpeg
 
-fate: $(FATE)
+fate:: $(FATE)
 
 $(FATE): $(TOOL)$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
 	@echo "TEST    $(@:fate-%=%)"
-- 
1.7.8.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20111223/92c45891/attachment.asc>


More information about the ffmpeg-devel mailing list