[FFmpeg-devel] [PATCH] fate: check if rsync has the contimeout option
Jean First
jeanfirst at gmail.com
Wed Nov 7 09:29:18 CET 2012
rsync on osx misses the --contimeout option
Signed-off-by: Jean First <jeanfirst at gmail.com>
---
This can be applied on top of "fate-rsync: replace -a by -rlt" but I'm not
sure it is wise to missues the HAVE_LIST for this.
configure | 2 ++
tests/Makefile | 4 ++++
2 files changed, 6 insertions(+)
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..2377764 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -134,8 +134,12 @@ ifdef SAMPLES
FATE += $(FATE_FULL) $(FATE_FULL-yes)
FATE += $(FATE_EXTERN)
fate-rsync:
+ifdef HAVE_RSYNC_CONTIMEOUT
rsync -vrltLW --timeout=60 --contimeout=60 rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
else
+ rsync -vrltLW --timeout=60 rsync://fate-suite.ffmpeg.org/fate-suite/ $(SAMPLES)
+endif
+else
fate::
@echo "warning: only a subset of the fate tests will be run because SAMPLES is not specified"
fate-rsync:
--
1.7.9.6 (Apple Git-31.1)
More information about the ffmpeg-devel
mailing list