[FFmpeg-devel] [PATCH] fate: check if rsync has the contimeout option

[Clément Bœsch]

On Wed, Nov 07, 2012 at 11:27:06AM +0100, Jean First wrote:
> rsync on osx misses the --contimeout option
> 
> Signed-off-by: Jean First <jeanfirst at gmail.com>
> ---
> 
> I agree. Thanks Nicolas.
> Again, this can be applied on top of "fate-rsync: replace -a by -rlt".
> 
>  configure      |    2 ++
>  tests/Makefile |    5 ++++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index ae11f5d..14ddb5c 100755
> --- a/configure
> +++ b/configure
> @@ -1378,6 +1378,7 @@ HAVE_LIST="
>      posix_memalign
>      pthread_cancel
>      rdtsc
> +    rsync_contimeout
>      sched_getaffinity
>      sdl
>      sdl_video_size
> @@ -3768,6 +3769,7 @@ texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disab
>  makeinfo --version > /dev/null 2>&1 && enable makeinfo  || disable makeinfo
>  perl --version > /dev/null 2>&1 && enable perl || disable perl
>  pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
> +rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
>  
>  check_header linux/fb.h
>  check_header linux/videodev.h
> diff --git a/tests/Makefile b/tests/Makefile
> index da7fdc1..afaee79 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -126,6 +126,9 @@ FATE_EXTERN += $(FATE_EXTERN-yes)
>  FATE += $(FATE-yes)
>  FATE += $(FATE_LIBAVUTIL)
>  
> +RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
> +RSYNC_OPTIONS = -vrltLW --timeout=60 $(RSYNC_OPTIONS-yes)
> +
>  $(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF)
>  
>  $(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF)
> @@ -134,7 +137,7 @@ ifdef SAMPLES
>  FATE += $(FATE_FULL) $(FATE_FULL-yes)
>  FATE += $(FATE_EXTERN)
>  fate-rsync:
> -	rsync -vrltLW --timeout=60 --contimeout=60 rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
> +	rsync $(RSYNC_OPTIONS) rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
>  else
>  fate::
>  	@echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"

What happened to this patch?

-- 
Clément B.
-------------- 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/20121120/7abeacb0/attachment.asc>