[FFmpeg-devel] [PATCH] fate: Rename FATE_SAMPLES make file variable to FATE_EXTERN

Alexander Strasser eclipse7 at gmx.net
Wed Aug 1 22:46:57 CEST 2012


Alexander Strasser wrote:
>   Restore functionality to set the samples directory via the
> FATE_SAMPLES environment variable . This is broken since commit
> 63dcd16 was merged.
> 
>   Additionally the name FATE_EXTERN is more suited as the current
> FATE_SAMPLES make file variable does not carry the name of the
> FATE samples or the name of the directory they are stored in, but
> does contain the names of the FATE targets that need external
> samples. That is samples that are not in the repository and are
> not generated on the fly.
> 
> Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
> ---
> 
>   It would probably make sense to rename FATE_SAMPLES_FFMPEG/AVCONV too.
> But I wanted to wait for review first and if others think it is necesarry
> or better.

  Will push as is this weekend (if I hear no complaints).  

  Alexander



>  tests/Makefile | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index 558e523..0d0caaa 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -100,8 +100,8 @@ FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
>  
>  FATE-$(CONFIG_AVCODEC)  += $(FATE_LIBAVCODEC)
>  
> -FATE_SAMPLES-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG)
> -FATE_SAMPLES += $(FATE_SAMPLES-yes)
> +FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG)
> +FATE_EXTERN += $(FATE_EXTERN-yes)
>  
>  FATE += $(FATE-yes)
>  FATE += $(FATE_LIBAVUTIL)
> @@ -125,7 +125,7 @@ fate-seek:   $(FATE_SEEK)
>  ifdef SAMPLES
>  FATE += $(FATE_LAVF_FATE)
>  FATE += $(FATE_FULL) $(FATE_FULL-yes)
> -FATE += $(FATE_SAMPLES)
> +FATE += $(FATE_EXTERN)
>  fate-rsync:
>  	rsync -vaLW --timeout=60 --contimeout=60 rsync://fate-suite.avcodec.org/fate-suite/ $(SAMPLES)
>  else
> @@ -133,7 +133,7 @@ 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_SAMPLES):
> +$(FATE_EXTERN):
>  	@echo "$@ requires external samples and SAMPLES not specified"; false
>  endif


More information about the ffmpeg-devel mailing list