diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-06 23:10:20 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-04-06 23:10:20 +0300 |
commit | cab5ce4fc0eeee6024632cfb3815a7b6e3b70885 (patch) | |
tree | 70ce279332b2c3730204ffa7dc2e9b01059c5921 /mesonbuild/backend/ninjabackend.py | |
parent | 5d53c6b7415b62f2172129a61770cf38aa3f3c1d (diff) | |
parent | 3f3fcace3d91da7d2643354e06a4b8d3c7143f86 (diff) | |
download | meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.zip meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.gz meson-cab5ce4fc0eeee6024632cfb3815a7b6e3b70885.tar.bz2 |
Merge pull request #438 from trhd/testing_options
New options for controlling test output.
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 5263d86..d53730a 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -18,10 +18,9 @@ from .. import build from .. import mlog from .. import dependencies from .. import compilers -from ..mesonlib import File +from ..mesonlib import File, MesonException from .backends import InstallData from ..build import InvalidArguments -from ..coredata import MesonException import os, sys, pickle, re import subprocess, shutil @@ -586,7 +585,12 @@ 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'] + if self.environment.coredata.get_builtin_option('errorlogs'): + cmd += ['--print-errorlogs'] + 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.') |