[SCons] Add option to pass flags to GTest

This commit is contained in:
Ray Speth 2017-02-19 12:07:59 -05:00
parent 3c771ded2b
commit 461b63e462
4 changed files with 15 additions and 2 deletions

View file

@ -590,6 +590,11 @@ config_options = [
'VERBOSE',
"""Create verbose output about what SCons is doing.""",
False),
(
'gtest_flags',
"""Additional options passed to each GTest test suite, e.g.
'--gtest_filter=*pattern*'. Separate multiple options with spaces.""",
''),
BoolVariable(
'renamed_shared_libraries',
"""If this option is turned on, the shared libraries that are created

View file

@ -487,6 +487,12 @@ Options List
- default: ``'no'``
.. _gtest-flags:
* ``gtest_flags``: [ ``string`` ]
Additional options passed to each GTest test suite, e.g.
`--gtest_filter=*pattern*`. Separate multiple options with spaces.
.. _renamed-shared-libraries:
* ``renamed_shared_libraries``: [ ``yes`` | ``no`` ]

View file

@ -146,6 +146,7 @@ Less Common Options
* :ref:`env_vars <env-vars>`
* :ref:`layout <layout>`
* :ref:`VERBOSE <VERBOSE>`
* :ref:`gtest_flags <gtest-flags>`
.. _sec-build-commands:

View file

@ -50,8 +50,9 @@ def addTestProgram(subdir, progName, env_vars={}):
if not os.path.isdir(workDir):
os.mkdir(workDir)
code = subprocess.call([program.abspath, '--gtest_output=xml:'+resultsFile],
env=env['ENV'], cwd=workDir)
cmd = [program.abspath, '--gtest_output=xml:'+resultsFile]
cmd.extend(env['gtest_flags'].split())
code = subprocess.call(cmd, env=env['ENV'], cwd=workDir)
if code:
print "FAILED: Test '{0}' exited with code {1}".format(progName, code)