ffmpeg | branch: master | Martin Storsjö <mar...@martin.st> | Tue May 21 10:21:37 2013 +0300| [286ab878bd39b56008035638227b3ecb8ec5bbb7] | committer: Martin Storsjö
fate.sh: Allow setting other make flags for running tests If makeopts_fate is set, these makeopts are used for running the tests instead of the normal makeopts. If it isn't set, the normal makeopts variable is used as before. This is useful if remote testing on a lesser machine where a large number of parallel jobs might be undesireable, while wanting to speed up the build with many parallel processes. Signed-off-by: Martin Storsjö <mar...@martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=286ab878bd39b56008035638227b3ecb8ec5bbb7 --- doc/fate.texi | 2 ++ tests/fate.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/fate.texi b/doc/fate.texi index 9b8d953..9e654e7 100644 --- a/doc/fate.texi +++ b/doc/fate.texi @@ -159,6 +159,8 @@ extra_conf= # extra configure options not covered above #make= # name of GNU make if not 'make' makeopts= # extra options passed to 'make' +#makeopts_fate= # extra options passed to 'make' when running tests, + # defaulting to makeopts above if this is not set #tar= # command to create a tar archive from its arguments on # stdout, defaults to 'tar c' @end example diff --git a/tests/fate.sh b/tests/fate.sh index b8ee1ae..f7ca891 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -73,7 +73,7 @@ compile()( fate()( test "$build_only" = "yes" && return cd ${build} || return - ${make} ${makeopts} -k fate + ${make} ${makeopts_fate-${makeopts}} -k fate ) clean(){ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog