aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/backend/ninjabackend.py
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2016-02-27 01:49:32 +0200
committerHemmo Nieminen <hemmo.nieminen@iki.fi>2016-04-04 02:52:30 +0300
commit7fb04c207bbb22ce5038382fe89822df90c1c1e3 (patch)
treee4666a9d841fc16de55d932300094fc8c9661245 /mesonbuild/backend/ninjabackend.py
parentaf6f4c9b9c48d482181642ab40c1a951735ca89a (diff)
downloadmeson-7fb04c207bbb22ce5038382fe89822df90c1c1e3.zip
meson-7fb04c207bbb22ce5038382fe89822df90c1c1e3.tar.gz
meson-7fb04c207bbb22ce5038382fe89822df90c1c1e3.tar.bz2
Implement stdsplit builtin option.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r--mesonbuild/backend/ninjabackend.py5
1 files changed, 4 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.')