Share the CMake pch consumer block, apply review suggestions

tests/unit_tests/build_helpers/test_pch.py

@@ -232,6 +232,34 @@ def test_pch_strict(
     assert pch.pch_strict() is expected
 
 
+def test_pch_cmake_consumer_substitutes_target_and_sources(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.delenv("ESPHOME_PCH_ENABLE", raising=False)
+    monkeypatch.delenv("ESPHOME_PCH_STRICT", raising=False)
+    block = pch.pch_cmake_consumer("app", "${APP_SOURCES}")
+    assert "target_compile_options(app PRIVATE" in block
+    assert '"$<$<COMPILE_LANGUAGE:CXX>:-Winvalid-pch>"' in block
+    assert "-Wno-error=invalid-pch" in block
+    assert '"$<$<COMPILE_LANGUAGE:CXX>:esphome_pch.h>"' in block
+    assert "set_source_files_properties(${APP_SOURCES} PROPERTIES" in block
+    assert 'OBJECT_DEPENDS "${CMAKE_BINARY_DIR}/esphome_pch.h"' in block
+
+
+def test_pch_cmake_consumer_strict_escalates(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("ESPHOME_PCH_STRICT", "1")
+    assert "-Werror=invalid-pch" in pch.pch_cmake_consumer("app", "${APP_SOURCES}")
+
+
+def test_pch_cmake_consumer_empty_when_disabled(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("ESPHOME_PCH_ENABLE", "0")
+    assert pch.pch_cmake_consumer("app", "${APP_SOURCES}") == ""
+
+
 def test_pch_degraded_raises_only_in_strict(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:

tests/unit_tests/components/nrf52/test_pch.py

@@ -221,17 +221,30 @@ class TestRunCompilePhases:
     def test_generated_headers_failure_raises(self, compile_ctx) -> None:
         run_cmd, prepare, _ = compile_ctx
         run_cmd.side_effect = [True, False]
-        with pytest.raises(EsphomeError, match="nRF52 native build failed"):
+        with pytest.raises(EsphomeError, match="header generation failed"):
             self._run()
         assert not prepare.called
 
     def test_cmake_phase_failure_raises(self, compile_ctx) -> None:
         run_cmd, prepare, _ = compile_ctx
         run_cmd.side_effect = [False]
-        with pytest.raises(EsphomeError, match="nRF52 native build failed"):
+        with pytest.raises(EsphomeError, match="configure failed"):
             self._run()
         assert not prepare.called
 
+    def test_ccache_pch_env_reaches_west(self, compile_ctx) -> None:
+        run_cmd, _, _ = compile_ctx
+        run_cmd.side_effect = [False]
+        # clear=True also drops ambient CCACHE_*/ESPHOME_PCH_* overrides
+        with (
+            patch.dict("os.environ", {}, clear=True),
+            pytest.raises(EsphomeError, match="configure failed"),
+        ):
+            self._run()
+        env = run_cmd.call_args.kwargs["env"]
+        assert env["CCACHE_PCH_EXTSUM"] == "true"
+        assert env["CCACHE_SLOPPINESS"] == "pch_defines,time_macros"
+
     def test_settled_db_skips_cmake_phase(self, compile_ctx) -> None:
         run_cmd, prepare, build_dir = compile_ctx
         build_dir.mkdir(parents=True)
@@ -275,13 +288,18 @@ class TestRunCompilePhases:
     def test_prepare_failure_never_aborts_the_build(
         self, compile_ctx, caplog: pytest.LogCaptureFixture
     ) -> None:
-        run_cmd, prepare, _ = compile_ctx
+        run_cmd, prepare, build_dir = compile_ctx
+        build_dir.mkdir(parents=True)
+        # Keep the pristine wipe from dropping the dir the fallback touches
+        (build_dir / "CMakeCache.txt").write_text("")
         prepare.side_effect = RuntimeError("boom")
         run_cmd.side_effect = [True, True, False]
         with pytest.raises(EsphomeError, match="nRF52 native build failed"):
             self._run()
         assert run_cmd.call_count == 3
         assert "Precompiled header setup failed" in caplog.text
+        # The fallback still satisfies OBJECT_DEPENDS
+        assert (build_dir / "esphome_pch.h").is_file()
 
     def test_prepare_failure_strict_raises(
         self, monkeypatch: pytest.MonkeyPatch, compile_ctx