diff options
| author | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-02-27 01:49:32 +0200 |
|---|---|---|
| committer | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-04-04 02:52:30 +0300 |
| commit | 7fb04c207bbb22ce5038382fe89822df90c1c1e3 (patch) | |
| tree | e4666a9d841fc16de55d932300094fc8c9661245 | |
| parent | af6f4c9b9c48d482181642ab40c1a951735ca89a (diff) | |
| download | meson-7fb04c207bbb22ce5038382fe89822df90c1c1e3.zip meson-7fb04c207bbb22ce5038382fe89822df90c1c1e3.tar.gz meson-7fb04c207bbb22ce5038382fe89822df90c1c1e3.tar.bz2 | |
Implement stdsplit builtin option.
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 5 | ||||
| -rw-r--r-- | mesonbuild/coredata.py | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 8984008..cf75762 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -583,7 +583,10 @@ int dummy; valgrind = environment.find_valgrind() script_root = self.environment.get_script_dir() test_data = os.path.join(self.environment.get_scratch_dir(), 'meson_test_setup.dat') - cmd = [sys.executable, self.environment.get_build_command(), '--internal', 'test', test_data] + cmd = [ sys.executable, self.environment.get_build_command(), '--internal', 'test' ] + if not self.environment.coredata.get_builtin_option('stdsplit'): + cmd += ['--no-stdsplit'] + cmd += [ test_data ] elem = NinjaBuildElement(self.all_outputs, 'test', 'CUSTOM_COMMAND', ['all', 'PHONY']) elem.add_item('COMMAND', cmd) elem.add_item('DESC', 'Running all tests.') diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 78eb6d4..03e4355 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -210,6 +210,7 @@ builtin_options = { 'layout' : [ UserComboOption, 'Build directory layout.', ['mirror', 'flat' ], 'mirror' ], 'default_library' : [ UserComboOption, 'Default library type.', [ 'shared', 'static' ], 'shared' ], 'backend' : [ UserComboOption, 'Backend to use.', [ 'ninja', 'vs2010', 'xcode' ], 'ninja' ], + 'stdsplit' : [ UserBooleanOption, 'Split stdout and stderr in test logs.', True ], } forbidden_target_names = {'clean': None, |