rsync on osx misses the --contimeout option Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>tags/n1.1
| @@ -1413,6 +1413,7 @@ HAVE_LIST=" | |||||
| posix_memalign | posix_memalign | ||||
| pthread_cancel | pthread_cancel | ||||
| rdtsc | rdtsc | ||||
| rsync_contimeout | |||||
| sched_getaffinity | sched_getaffinity | ||||
| sdl | sdl | ||||
| sdl_video_size | sdl_video_size | ||||
| @@ -3910,6 +3911,7 @@ texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disab | |||||
| makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo | makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo | ||||
| perl --version > /dev/null 2>&1 && enable perl || disable perl | perl --version > /dev/null 2>&1 && enable perl || disable perl | ||||
| pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man | 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/fb.h | ||||
| check_header linux/videodev.h | check_header linux/videodev.h | ||||
| @@ -125,6 +125,9 @@ FATE_EXTERN += $(FATE_EXTERN-yes) | |||||
| FATE += $(FATE-yes) | FATE += $(FATE-yes) | ||||
| 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_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) | ||||
| $(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF) | $(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF) | ||||
| @@ -133,7 +136,7 @@ ifdef SAMPLES | |||||
| FATE += $(FATE_FULL) $(FATE_FULL-yes) | FATE += $(FATE_FULL) $(FATE_FULL-yes) | ||||
| FATE += $(FATE_EXTERN) | FATE += $(FATE_EXTERN) | ||||
| fate-rsync: | 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 | else | ||||
| fate:: | fate:: | ||||
| @echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified" | @echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified" | ||||