diff options
| author | Jean First <jeanfirst@gmail.com> | 2012-11-07 11:27:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-15 01:33:19 +0100 |
| commit | a8b3f0c5cf548f654e30c981988bb71981a3f8d3 (patch) | |
| tree | 5c5f68100b119a57c25fa05a10cb2caa6791e911 | |
| parent | b6671787db5b5d53e065f88e52a35d94cb50504c (diff) | |
| download | ffmpeg-a8b3f0c5cf548f654e30c981988bb71981a3f8d3.tar.gz | |
fate: check if rsync has the contimeout option
rsync on osx misses the --contimeout option
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | tests/Makefile | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -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 dfb12b0e11..f1472f3547 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" |