mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'
* commit '286ab878bd39b56008035638227b3ecb8ec5bbb7': fate.sh: Allow setting other make flags for running tests Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
22164971b0
|
@ -26,5 +26,7 @@ extra_conf= # extra configure options not covered above
|
||||||
|
|
||||||
#make= # name of GNU make if not 'make'
|
#make= # name of GNU make if not 'make'
|
||||||
makeopts= # extra options passed to '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,
|
#tar= # command to create a tar archive from its arguments on stdout,
|
||||||
# defaults to 'tar c'
|
# defaults to 'tar c'
|
||||||
|
|
|
@ -75,7 +75,7 @@ compile()(
|
||||||
fate()(
|
fate()(
|
||||||
test "$build_only" = "yes" && return
|
test "$build_only" = "yes" && return
|
||||||
cd ${build} || return
|
cd ${build} || return
|
||||||
${make} ${makeopts} -k fate
|
${make} ${makeopts_fate-${makeopts}} -k fate
|
||||||
)
|
)
|
||||||
|
|
||||||
clean(){
|
clean(){
|
||||||
|
|
Loading…
Reference in New Issue