Merge branch 'esp8266-native-build-spec' into esp8266-native-ninja-emission

This commit is contained in:
J. Nick Koston
2026-08-21 21:27:59 -05:00
2 changed files with 7 additions and 3 deletions
+3 -2
View File
@@ -142,8 +142,9 @@ def check_and_install(framework_version: Version) -> InstalledPaths:
# Sentinel: "resolve for me" (None is a real value meaning disabled).
# run_compile resolves once and threads the result so one build never pays
# the PATH scan and runnability probe three times.
# The native run_compile (a later PR in the chain) will resolve once and
# thread the result so one build never pays the PATH scan and runnability
# probe three times.
CCACHE_UNRESOLVED: Any = object()
@@ -157,7 +157,10 @@ def test_get_build_env_without_path_has_no_empty_entry(tmp_path: Path) -> None:
def test_ccache_env_accepts_a_preresolved_path() -> None:
"""A caller that already resolved ccache threads it through; the probe
must not run again (None means resolved-and-disabled)."""
with patch.object(framework, "ccache_path") as mock_resolve:
with (
patch.dict(os.environ, {}, clear=True),
patch.object(framework, "ccache_path") as mock_resolve,
):
assert framework.ccache_env(None) == {}
env = framework.ccache_env("/usr/bin/ccache")
mock_resolve.assert_not_called()