ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Tue Apr 4 15:03:34 2017 -0300| [22164971b0b1ef5c7628fc2ec1eafb768fa449ac] | committer: James Almer
Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7' * commit '286ab878bd39b56008035638227b3ecb8ec5bbb7': fate.sh: Allow setting other make flags for running tests Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=22164971b0b1ef5c7628fc2ec1eafb768fa449ac --- doc/fate_config.sh.template | 2 ++ tests/fate.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/fate_config.sh.template b/doc/fate_config.sh.template index 059a1f8..56acb26 100644 --- a/doc/fate_config.sh.template +++ b/doc/fate_config.sh.template @@ -26,5 +26,7 @@ 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' diff --git a/tests/fate.sh b/tests/fate.sh index bbdc701..6fa631e 100755 --- a/tests/fate.sh +++ b/tests/fate.sh @@ -75,7 +75,7 @@ compile()( fate()( test "$build_only" = "yes" && return cd ${build} || return - ${make} ${makeopts} -k fate + ${make} ${makeopts_fate-${makeopts}} -k fate ) clean(){ ====================================================================== diff --cc doc/fate_config.sh.template index 059a1f8,0000000..56acb26 mode 100644,000000..100644 --- a/doc/fate_config.sh.template +++ b/doc/fate_config.sh.template @@@ -1,30 -1,0 +1,32 @@@ +slot= # some unique identifier +repo=git://source.ffmpeg.org/ffmpeg.git # the source repository +#branch=release/2.6 # the branch to test +samples= # path to samples directory +workdir= # directory in which to do all the work +#fate_recv="ssh -T f...@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= +cpu= +cross_prefix= +as= +cc= +ld= +target_os= +sysroot= +target_exec= +target_path= +target_samples= +extra_cflags= +extra_ldflags= +extra_libs= +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' _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog