Browse Source

Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'

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

Merged-by: James Almer <jamrial@gmail.com>
tags/n3.4
James Almer 9 years ago
parent
commit
22164971b0
2 changed files with 3 additions and 1 deletions
  1. +2
    -0
      doc/fate_config.sh.template
  2. +1
    -1
      tests/fate.sh

+ 2
- 0
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'

+ 1
- 1
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(){


Loading…
Cancel
Save