RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'

Browse Source 
* commit '286ab878bd39b56008035638227b3ecb8ec5bbb7':
  fate.sh: Allow setting other make flags for running tests

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-04-04 15:03:34 -03:00
commit 22164971b0
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/fate_config.sh.template
View File

@ -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'

2
tests/fate.sh
View File

@ -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(){