diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 11:36:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-21 11:36:49 +0200 |
| commit | 877cae6effefb1695bb519070cf5df785ded4415 (patch) | |
| tree | 1a28d296d7f2db977a47747788dd0efa094b1170 | |
| parent | 3b071a4390f02ecbeb993f16f93b01f4e420def8 (diff) | |
| parent | c209d0df657f172f42d9bafbcdfa02dfb14f6965 (diff) | |
| download | ffmpeg-877cae6effefb1695bb519070cf5df785ded4415.tar.gz | |
Merge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965'
* commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965':
fate.sh: add support for build-only FATE instances
Conflicts:
doc/fate.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/fate_config.sh.template | 1 | ||||
| -rwxr-xr-x | tests/fate.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/fate_config.sh.template b/doc/fate_config.sh.template index f7bd625429..e11e48cc20 100644 --- a/doc/fate_config.sh.template +++ b/doc/fate_config.sh.template @@ -4,6 +4,7 @@ samples= # path to samples directory workdir= # directory in which to do all the work #fate_recv="ssh -T fate@fate.ffmpeg.org" # command to submit report comment= # optional description +build_only= # set to "yes" for a compile-only instance that skips tests # the following are optional and map to configure options arch= diff --git a/tests/fate.sh b/tests/fate.sh index 1f70e798c5..33710e06f4 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -67,6 +67,7 @@ compile()( ) fate()( + test "$build_only" = "yes" && return cd ${build} || return ${make} ${makeopts} -k fate ) |