From bc57e05760f4418a364886fe75c9eb6cc2989092 Mon Sep 17 00:00:00 2001
From: Zach Vorhies <zachvorhies@protonmail.com>
Date: Tue, 29 Sep 2026 13:17:16 -0700
Subject: [PATCH] fix(bench): parse fbuild's real AVR resolved-package names
 (#1536)

---
 .../fastled-examples/src/build_comparison.rs  | 28 +++++++++----------
 .../src/build_comparison_tests.rs             | 12 ++++++++
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/bench/fastled-examples/src/build_comparison.rs b/bench/fastled-examples/src/build_comparison.rs
index 0835933e..1d19b37e 100644
--- a/bench/fastled-examples/src/build_comparison.rs
+++ b/bench/fastled-examples/src/build_comparison.rs
@@ -1144,22 +1144,22 @@ fn parse_fbuild_build_packages(stdout: &[u8], board: Board) -> BTreeMap<String,
             }
         } else if board.key == "uno" {
             if let Some((_, resolved)) = line.split_once("AVR resolved:") {
-                for (key, package) in [
-                    ("toolchain", "toolchain-atmelavr"),
-                    ("framework", "framework-"),
-                ] {
-                    let field = if key == "toolchain" {
-                        resolved.split(';').next().unwrap_or("")
+                // Entries look like `name@version (url); name@version (url)`,
+                // with fbuild's own names (`avr-gcc`, `arduino-avr-core`).
+                for entry in resolved.split(';') {
+                    let Some((name, rest)) = entry.trim().split_once('@') else {
+                        continue;
+                    };
+                    let version = rest.split_whitespace().next().unwrap_or("");
+                    let key = if name == "avr-gcc" || name.starts_with("toolchain-atmelavr") {
+                        "toolchain"
+                    } else if name == "arduino-avr-core" || name.starts_with("framework-") {
+                        "framework"
                     } else {
-                        resolved.split(';').nth(1).unwrap_or("")
+                        continue;
                     };
-                    if let Some(value) = field.split_once(package).map(|(_, value)| value) {
-                        if let Some((_, version)) = value.split_once('@') {
-                            let version = version.split_whitespace().next().unwrap_or("");
-                            if !version.is_empty() {
-                                packages.insert(key.to_string(), version.to_string());
-                            }
-                        }
+                    if !version.is_empty() {
+                        packages.insert(key.to_string(), version.trim_end_matches(',').to_string());
                     }
                 }
             }
diff --git a/bench/fastled-examples/src/build_comparison_tests.rs b/bench/fastled-examples/src/build_comparison_tests.rs
index 79738e0e..3a397367 100644
--- a/bench/fastled-examples/src/build_comparison_tests.rs
+++ b/bench/fastled-examples/src/build_comparison_tests.rs
@@ -614,6 +614,18 @@ fn fbuild_avr_build_log_reports_selected_package_versions() {
     assert_eq!(packages["framework"], "1.8.8");
 }
 
+#[test]
+fn fbuild_avr_build_log_parses_real_resolved_package_names() {
+    // Verbatim from Arduino Uno benchmark run 36381617967 (FastLED/fbuild#1536).
+    let packages = parse_fbuild_build_packages(
+        b"   1.61 AVR resolved: avr-gcc@1.70300.191015 (https://dl.registry.platformio.org/download/platformio/tool/toolchain-atmelavr/1.70300.191015/toolchain-atmelavr-linux_x86_64-1.70300.191015.tar.gz); arduino-avr-core@5.2.0 (https://dl.registry.platformio.org/download/platformio/tool/framework-arduino-avr/5.2.0/framework-arduino-avr-5.2.0.tar.gz)\n",
+        BOARDS[0],
+    );
+    assert_eq!(packages["toolchain"], "1.70300.191015");
+    assert_eq!(packages["framework"], "5.2.0");
+    assert!(package_metadata_is_complete("uno", &packages));
+}
+
 #[test]
 fn changed_package_identities_across_trials_become_unverified() {
     let mut packages = BTreeMap::new();