diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-04 15:03:34 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-04-04 15:03:34 -0300 |
| commit | 22164971b0b1ef5c7628fc2ec1eafb768fa449ac (patch) | |
| tree | ab0166cb63eb6fca4db4642c5517b661e4ccd07a | |
| parent | b20bf5584f7a420b000fbea87a507bf171f340c6 (diff) | |
| parent | 286ab878bd39b56008035638227b3ecb8ec5bbb7 (diff) | |
Merge commit '286ab878bd39b56008035638227b3ecb8ec5bbb7'
* commit '286ab878bd39b56008035638227b3ecb8ec5bbb7':
fate.sh: Allow setting other make flags for running tests
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | doc/fate_config.sh.template | 2 | ||||
| -rwxr-xr-x | tests/fate.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/fate_config.sh.template b/doc/fate_config.sh.template index 059a1f862f..56acb2667d 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 bbdc7015a6..6fa631ea00 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(){ |