[FFmpeg-cvslog] fate: check if rsync has the contimeout option
Jean First
git at videolan.org
Sat Dec 15 01:59:44 CET 2012
ffmpeg | branch: master | Jean First <jeanfirst at gmail.com> | Wed Nov 7 11:27:06 2012 +0100| [a8b3f0c5cf548f654e30c981988bb71981a3f8d3] | committer: Michael Niedermayer
fate: check if rsync has the contimeout option
rsync on osx misses the --contimeout option
Signed-off-by: Jean First <jeanfirst at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8b3f0c5cf548f654e30c981988bb71981a3f8d3
---
configure | 2 ++
tests/Makefile | 5 ++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index e21dcb6..a50d073 100755
--- a/configure
+++ b/configure
@@ -1413,6 +1413,7 @@ HAVE_LIST="
posix_memalign
pthread_cancel
rdtsc
+ rsync_contimeout
sched_getaffinity
sdl
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
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 dfb12b0..f1472f3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -125,6 +125,9 @@ FATE_EXTERN += $(FATE_EXTERN-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_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(EXESUF)
@@ -133,7 +136,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"
More information about the ffmpeg-cvslog
mailing list