History

fate: check if rsync has the contimeout option

rsync on osx misses the --contimeout option

Jean First committed 14 years ago

Commit a8b3f0c1 parent b6671782 files · +6 −1Browse files

Unified · Split

2 files
  1. configure +2 −0
  2. tests/Makefile +4 −1
configure+2−0
@@ -1413,6 +1413,7 @@ HAVE_LIST=" · 1412 unmodified lines
1413 posix_memalign1413 posix_memalign
1414 pthread_cancel1414 pthread_cancel
1415 rdtsc1415 rdtsc
1416 rsync_contimeout
1416 sched_getaffinity1417 sched_getaffinity
1417 sdl1418 sdl
1418 sdl_video_size1419 sdl_video_size
@@ -3910,6 +3911,7 @@ texi2html --help 2> /dev/null | grep -q 'init-file' && enable texi2html || disab · 2491 unmodified lines
3910makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo3911makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
3911perl --version > /dev/null 2>&1 && enable perl || disable perl3912perl --version > /dev/null 2>&1 && enable perl || disable perl
3912pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man3913pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
3914rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
3913 3915
3914check_header linux/fb.h3916check_header linux/fb.h
3915check_header linux/videodev.h3917check_header linux/videodev.h
tests/Makefile+4−1
@@ -125,6 +125,9 @@ FATE_EXTERN += $(FATE_EXTERN-yes) · 124 unmodified lines
125 125
126FATE += $(FATE-yes)126FATE += $(FATE-yes)
127 127
128RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60
129RSYNC_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
133FATE += $(FATE_FULL) $(FATE_FULL-yes)136FATE += $(FATE_FULL) $(FATE_FULL-yes)
134FATE += $(FATE_EXTERN)137FATE += $(FATE_EXTERN)
135fate-rsync:138fate-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)
137else140else
138fate::141fate::
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"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t