From 8fdad47b27528940212ae1f083900fadf440e603 Mon Sep 17 00:00:00 2001 From: mikecarper Date: Wed, 28 Oct 2026 03:26:36 -0700 Subject: [PATCH] Keep Mini single-use helpers out of line and align native fixtures --- scripts/stm32_mini_size.py | 1 + test/fixtures/rs232_runtime/json.cpp | 2 +- test/test_companion_identity_cli.py | 2 ++ test/test_companion_wifi_status.py | 4 +++- test/test_management_password_commands.py | 3 +++ test/test_stm32_mini_repeater_profile.py | 1 + test/test_storage_layout_cli.py | 4 +++- variants/wio-e5-mini/platformio.ini | 1 + 8 files changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/stm32_mini_size.py b/scripts/stm32_mini_size.py index 82f2087cd..6dae59350 100644 --- a/scripts/stm32_mini_size.py +++ b/scripts/stm32_mini_size.py @@ -12,4 +12,5 @@ if env["PIOENV"] == "wio-e5-mini_repeater": "-fno-reorder-blocks", "-fno-reorder-functions", "-fno-tree-switch-conversion", + "-fno-inline-functions-called-once", ]) diff --git a/test/fixtures/rs232_runtime/json.cpp b/test/fixtures/rs232_runtime/json.cpp index b52083cd8..f730a6839 100644 --- a/test/fixtures/rs232_runtime/json.cpp +++ b/test/fixtures/rs232_runtime/json.cpp @@ -11,7 +11,7 @@ struct NodePrefs : ConfigSerializer { uint16_t bridge_delay = 500; uint8_t bridge_pkt_src = 1, bridge_channel = 1, bridge_format = 0; uint32_t bridge_baud = 115200; - uint8_t usb_logging_enabled = 0, usb_debug_enabled = 0; + uint8_t usb_logging_enabled = 0, usb_debug_enabled = 0, usb_logging_always = 0; uint8_t rs232_autosleep = 1; uint8_t rs232_heartbeat = 1; uint16_t rs232_idle_seconds = 300; diff --git a/test/test_companion_identity_cli.py b/test/test_companion_identity_cli.py index 928193cfc..08340814d 100644 --- a/test/test_companion_identity_cli.py +++ b/test/test_companion_identity_cli.py @@ -20,6 +20,7 @@ HARNESS = r''' #include #include #include +#include "usb_mode_console.h" // Keep the production diagnostics delegate in the command path. Identity // requests must not consult board power state or trigger a hardware query. @@ -190,6 +191,7 @@ class CompanionIdentityCliTests(unittest.TestCase): '-fsanitize=address,undefined', '-fno-sanitize-recover=all', '-fno-pie', '-no-pie', *['-D' + flag for flag in flags], '-I', str(ROOT / 'src'), '-I', str(ROOT / 'test/mocks'), + '-I', str(ROOT / 'test/fixtures'), str(cpp), '-o', str(binary)], capture_output=True, text=True) self.assertEqual(built.returncode, 0, built.stdout + built.stderr) ran = subprocess.run([str(binary)], capture_output=True, text=True) diff --git a/test/test_companion_wifi_status.py b/test/test_companion_wifi_status.py index ca7655d25..c7e4324fc 100644 --- a/test/test_companion_wifi_status.py +++ b/test/test_companion_wifi_status.py @@ -17,7 +17,9 @@ class CompanionWiFiStatusTest(unittest.TestCase): self.assertIn('strcmp(command, "get wifi.status") == 0', main) self.assertNotIn('"get wifi.status detail"', main) self.assertNotIn('"get wifi.compat"', main) - self.assertIn('get wifi.status (connection, saved/boot/live settings)', mesh) + self.assertIn('#include "CompanionHelp.inc"', mesh) + self.assertIn('get wifi.status (connection, saved/boot/live settings)', + (ROOT / "examples/companion_radio/CompanionHelp.inc").read_text()) self.assertIn('formatCompanionWiFiStatusSnapshot(reply, reply_size, snapshot);', main) local = mesh[mesh.index("bool MyMesh::handleLocalControlCommand("):] self.assertLess(local.index("handleCompanionWiFiCompatibilityCommand("), diff --git a/test/test_management_password_commands.py b/test/test_management_password_commands.py index f8e1be900..49a2b690d 100644 --- a/test/test_management_password_commands.py +++ b/test/test_management_password_commands.py @@ -26,6 +26,9 @@ class ManagementPasswordCommandsTest(unittest.TestCase): #include #include #include +struct HardwareSerial {}; +static HardwareSerial Serial; +#include using namespace mesh::esp32::managementPassword; bool save_ok = true; int saves = 0; bool durableSave() { diff --git a/test/test_stm32_mini_repeater_profile.py b/test/test_stm32_mini_repeater_profile.py index 12de6af14..c671297e7 100644 --- a/test/test_stm32_mini_repeater_profile.py +++ b/test/test_stm32_mini_repeater_profile.py @@ -22,6 +22,7 @@ LINK_SIZE_FLAGS = ( "-fno-reorder-blocks", "-fno-reorder-functions", "-fno-tree-switch-conversion", + "-fno-inline-functions-called-once", ) OPTIONAL_CUTS = ( "MESH_ENABLE_CARRIER_TOOLS", diff --git a/test/test_storage_layout_cli.py b/test/test_storage_layout_cli.py index 046aa583b..85652836f 100644 --- a/test/test_storage_layout_cli.py +++ b/test/test_storage_layout_cli.py @@ -147,7 +147,9 @@ int main() { help_body = companion[help_start:help_end] self.assertRegex(help_body, r"auto& \w+ = terminalOutput\(\);") # This line may share a bounded help chunk with adjacent commands. - self.assertIn('" get storage.layout\\r\\n"', help_body) + self.assertIn('#include "CompanionHelp.inc"', help_body) + self.assertIn('" get storage.layout\\r\\n"', + (ROOT / "examples/companion_radio/CompanionHelp.inc").read_text()) # ESP-IDF discovery and every platform-specific result live only in the # shared formatter; neither role owns a second copy. diff --git a/variants/wio-e5-mini/platformio.ini b/variants/wio-e5-mini/platformio.ini index 60c5a6d51..16a2a0e11 100644 --- a/variants/wio-e5-mini/platformio.ini +++ b/variants/wio-e5-mini/platformio.ini @@ -44,6 +44,7 @@ build_flags = ${lora_e5_mini.build_flags} -fno-reorder-functions -fno-tree-switch-conversion -fno-inline-small-functions ; reduce flash without moving the deployed filesystem boundary + -fno-inline-functions-called-once -fipa-pta -fmerge-all-constants -fno-ipa-cp-clone