diff --git a/src/cmake_language_server/api.py b/src/cmake_language_server/api.py index 5ee8876..0c9ed7c 100644 --- a/src/cmake_language_server/api.py +++ b/src/cmake_language_server/api.py @@ -50,7 +50,8 @@ class API(object): proc = subprocess.run([self._cmake, self._build], universal_newlines=True, - capture_output=True) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) self.query_json.unlink() self.query_json.parent.rmdir() if proc.returncode != 0: @@ -133,7 +134,8 @@ endforeach() p = subprocess.run([self._cmake, '-P', tmplist], cwd=cmake_files['paths']['source'], universal_newlines=True, - capture_output=True) + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) if p.returncode != 0: return diff --git a/tests/conftest.py b/tests/conftest.py index b042aad..598524d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,18 +1,16 @@ -import logging - import pytest @pytest.fixture() def cmake_build(shared_datadir): - from subprocess import run + from subprocess import run, PIPE source = shared_datadir / 'cmake' build = source / 'build' build.mkdir() - p = run(['cmake', '-S', source, '-B', build], - check=True, - capture_output=True, - universal_newlines=True) - logging.debug(p.stdout) - logging.debug(p.stderr) + run(['cmake', source], + check=True, + cwd=build, + stdout=PIPE, + stderr=PIPE, + universal_newlines=True) yield build diff --git a/tests/test_api.py b/tests/test_api.py index e46d684..44dadf1 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -43,8 +43,9 @@ def test_parse_commands(cmake_build): api.parse_doc() p = subprocess.run(['cmake', '--help-command-list'], - capture_output=True, - universal_newlines=True) + universal_newlines=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) commands = p.stdout.strip().split('\n') for command in commands: @@ -59,8 +60,9 @@ def test_parse_variables(cmake_build): api.parse_doc() p = subprocess.run(['cmake', '--help-variable-list'], - capture_output=True, - universal_newlines=True) + universal_newlines=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) variables = p.stdout.strip().split('\n') for variable in variables: