rsync on osx misses the --contimeout option
Unified · Split
| @@ -1413,6 +1413,7 @@ HAVE_LIST=" · 1412 unmodified lines | |||
| 1413 | posix_memalign | 1413 | posix_memalign |
| 1414 | pthread_cancel | 1414 | pthread_cancel |
| 1415 | rdtsc | 1415 | rdtsc |
| 1416 | rsync_contimeout | ||
| 1416 | sched_getaffinity | 1417 | sched_getaffinity |
| 1417 | sdl | 1418 | sdl |
| 1418 | sdl_video_size | 1419 | sdl_video_size |
| @@ -3910,6 +3911,7 @@ texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disab · 2491 unmodified lines | |||
| 3910 | makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo | 3911 | makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo |
| 3911 | perl --version > /dev/null 2>&1 && enable perl || disable perl | 3912 | perl --version > /dev/null 2>&1 && enable perl || disable perl |
| 3912 | pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man | 3913 | pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man |
| 3914 | rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout | ||
| 3913 | 3915 | ||
| 3914 | check_header linux/fb.h | 3916 | check_header linux/fb.h |
| 3915 | check_header linux/videodev.h | 3917 | check_header linux/videodev.h |
| @@ -125,6 +125,9 @@ FATE_EXTERN += $(FATE_EXTERN-yes) · 124 unmodified lines | |||
| 125 | 125 | ||
| 126 | FATE += $(FATE-yes) | 126 | FATE += $(FATE-yes) |
| 127 | 127 | ||
| 128 | RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60 | ||
| 129 | RSYNC_OPTIONS = -vrltLW --timeout=60 $(RSYNC_OPTIONS-yes) | ||
| 130 | |||
| 128 | $(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) | 131 | $(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF) |
| 129 | 132 | ||
| 130 | $(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF) | 133 | $(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF) |
| @@ -133,7 +136,7 @@ ifdef SAMPLES · 2 unmodified lines | |||
| 133 | FATE += $(FATE_FULL) $(FATE_FULL-yes) | 136 | FATE += $(FATE_FULL) $(FATE_FULL-yes) |
| 134 | FATE += $(FATE_EXTERN) | 137 | FATE += $(FATE_EXTERN) |
| 135 | fate-rsync: | 138 | fate-rsync: |
| 136 | rsync -vrltLW --timeout=60 --contimeout=60 rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES) | 139 | rsync $(RSYNC_OPTIONS) rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES) |
| 137 | else | 140 | else |
| 138 | fate:: | 141 | fate:: |
| 139 | @echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified" | 142 | @echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified" |