fix: display quiet Meson configuration errors

Author: mikamikasuki

spin/cmds/meson.py

@@ -385,6 +385,8 @@ def build(
     if not (os.path.exists(build_dir) and _meson_version_configured(build_dir)):
         p = _run(setup_cmd, sys_exit=False, output=not quiet)
         if p.returncode != 0:
+            if quiet:
+                print(p.stdout.decode("utf-8"), end="")
             raise RuntimeError(
                 "Meson configuration failed; please try `spin build` again with the `--clean` flag."
             )

spin/tests/test_meson.py

@@ -4,12 +4,67 @@
 from os.path import join as pjoin
 from os.path import normpath
 
+import click
 import pytest
 
 from spin.cmds import meson
 from spin.containers import DotDict
 
 
+@pytest.fixture
+def failing_meson(tmp_path, monkeypatch):
+    monkeypatch.setenv("PYTHONIOENCODING", "utf-8")
+    script = tmp_path / "meson.py"
+    script.write_text(
+        "import sys\n"
+        "print('Meson setup: configuration error – wrong Cython version')\n"
+        "print('Diagnostic from stderr', file=sys.stderr)\n"
+        "sys.exit(1)\n",
+        encoding="utf-8",
+    )
+    monkeypatch.setattr(meson, "_meson_cli", lambda: [sys.executable, str(script)])
+    monkeypatch.setattr(meson, "get_config", lambda: DotDict({}))
+    return str(tmp_path / "build")
+
+
+@pytest.mark.parametrize("quiet", [False, True])
+def test_configuration_failure_output(failing_meson, capfd, quiet):
+    with pytest.raises(RuntimeError, match="Meson configuration failed"):
+        meson.build.callback(
+            meson_args=(), build_dir=failing_meson, prefix="/usr", quiet=quiet
+        )
+    captured = capfd.readouterr()
+    output = captured.out + captured.err
+    assert output.count("Meson setup: configuration error – wrong Cython version") == 1
+    assert output.count("Diagnostic from stderr") == 1
+
+
+def test_run_configuration_failure_output(failing_meson, monkeypatch, capfd):
+    monkeypatch.setattr(meson, "_get_configured_command", lambda name: meson.build)
+    with (
+        click.Context(meson.run),
+        pytest.raises(RuntimeError, match="Meson configuration failed"),
+    ):
+        meson.run.callback(
+            args=("unused-command",), build=True, build_dir=failing_meson
+        )
+    captured = capfd.readouterr()
+    assert "configuration error – wrong Cython version" in captured.err
+    assert "Diagnostic from stderr" in captured.err
+    assert "configuration error" not in captured.out
+
+
+def test_successful_quiet_build_output(failing_meson, capfd):
+    script = os.path.join(os.path.dirname(failing_meson), "meson.py")
+    with open(script, "w", encoding="utf-8") as file:
+        file.write("print('Successful build output')\n")
+    meson.build.callback(
+        meson_args=(), build_dir=failing_meson, prefix="/usr", quiet=True
+    )
+    captured = capfd.readouterr()
+    assert "Successful build output" not in captured.out + captured.err
+
+
 def make_paths(root, paths):
     for p in paths:
         os.makedirs(pjoin(root, p.lstrip("/")))