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

Michael Niedermayer michaelni at gmx.at
Sat Dec 15 01:40:47 CET 2012


On Sat, Dec 15, 2012 at 12:23:21AM +0100, Jean First wrote:
> On Wed Nov 28 2012 00:55:07 GMT+0100 (CET), Clément Bœsch wrote:
> >On Wed, Nov 21, 2012 at 01:09:05AM +0100, Michael Niedermayer wrote:
> >>On Wed, Nov 21, 2012 at 12:06:31AM +0100, Jean First wrote:
> >>>On Tue Nov 20 2012 23:07:43 GMT+0100 (CET), Clément Bœsch wrote:
> >>>>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?
> >>>afaict nobody ok'ed it...
> >>if it fixes something and breaks nothing, sure its ok
> >>
> >I can't test it, but it looks useful to me; isn't this necessary for
> >anyone working on Mac OS?
> 
> Can somebody please apply this patch?

applied

thanks

PS: If such patches are available on some public git clone then
people could easily checkout and test them and maybe it would have
been applied quicker. So maybe you want to setup a git repo on github
...

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20121215/81d54901/attachment.asc>


More information about the ffmpeg-devel mailing list