Merge branch 'esp8266-native-ninja-emission' into esp8266-arduino-toolchain

tests/unit_tests/build_helpers/test_idedata.py

@@ -151,11 +151,20 @@ def test_is_esphome_src_handles_backslash_paths() -> None:
     assert not idedata._is_esphome_src(r"C:\b\src\esphome\core\app.h")
 
 
-def test_parse_entry_empty_command_raises() -> None:
-    """A blank command fails with a named ValueError, not an IndexError."""
-    entry = {"directory": "/b", "file": "/b/src/x.cpp", "command": ""}
+@pytest.mark.parametrize(
+    ("command", "launcher"),
+    [
+        ("", None),
+        # A command that is only the launcher strips to nothing
+        ("/usr/bin/ccache", "/usr/bin/ccache"),
+    ],
+)
+def test_parse_entry_empty_command_raises(command: str, launcher: str | None) -> None:
+    """A blank (or launcher-only) command fails with a named ValueError,
+    not an IndexError."""
+    entry = {"directory": "/b", "file": "/b/src/x.cpp", "command": command}
     with pytest.raises(ValueError, match="empty compile command"):
-        idedata.parse_entry(entry)
+        idedata.parse_entry(entry, launcher)
 
 
 def test_idedata_from_build_empty_includes_raises(tmp_path: Path) -> None:
@@ -180,6 +189,30 @@ def test_idedata_from_build_empty_includes_raises(tmp_path: Path) -> None:
         idedata.idedata_from_build(compile_commands)
 
 
+def test_idedata_from_build_rsp_commands_never_dedupe(tmp_path: Path) -> None:
+    """Per-object response files strip to one shape while holding different
+    include sets; @-commands must tokenize per TU."""
+    entries = []
+    for name in ("a", "b"):
+        rsp = tmp_path / f"{name}.cpp.o.rsp"
+        rsp.write_text(f"-I{ABS}inc/{name}")
+        file = f"{ABS}build/src/esphome/core/{name}.cpp"
+        entries.append(
+            {
+                "directory": str(tmp_path),
+                "file": file,
+                "command": f"/tools/g++ @{rsp.name} -c {file} -o {name}.o",
+                "output": f"{name}.o",
+            }
+        )
+    compile_commands = tmp_path / "compile_commands.json"
+    compile_commands.write_text(json.dumps(entries))
+    with patch.object(idedata, "get_toolchain_includes", return_value=[]):
+        data = idedata.idedata_from_build(compile_commands)
+    joined = " ".join(data["includes"]["build"])
+    assert "inc/a" in joined and "inc/b" in joined
+
+
 def test_idedata_from_build_dedupes_identical_command_shapes(
     tmp_path: Path,
 ) -> None:

tests/unit_tests/test_size_summary.py

@@ -193,3 +193,25 @@ def test_print_summary_missing_flash_inputs_warn(
     size_json = _write_size_json(tmp_path, data)
     print_summary(size_json, partitions_csv=tmp_path / "partitions.cssv")
     assert "no image_size" in caplog.text
+
+
+def test_print_summary_non_dict_json_warns(tmp_path, caplog) -> None:
+    """Valid JSON that is not an object must warn, not raise past a build
+    that already linked."""
+    size_json = tmp_path / "size.json"
+    size_json.write_text("[]")
+    print_summary(size_json, tmp_path / "partitions.csv")
+    assert "unexpected shape" in caplog.text
+
+
+def test_print_summary_zero_app_partition_warns(tmp_path, caplog) -> None:
+    """A malformed partition row parsing to 0 must not render a 0% bar for
+    CI's memory-impact extraction to ingest."""
+    size_json = tmp_path / "size.json"
+    size_json.write_text(
+        '{"memory_types": {"DRAM": {"used": 1, "size": 2}}, "image_size": 100}'
+    )
+    partitions = tmp_path / "partitions.csv"
+    partitions.write_text("app0, app, ota_0, 0x10000, ,\n")
+    print_summary(size_json, partitions)
+    assert "app partition size is" in caplog.text