From 52d1ddc5af49f93de2d0ba8de284867490693b8a Mon Sep 17 00:00:00 2001 From: Andrew Quenehen Date: Thu, 6 Aug 2026 10:29:43 -0300 Subject: [PATCH] Fix Switch OTA clean and NX version chip test after launcher layout changes. --- ports/switch/ota-launcher/Makefile | 1 + tests/engine/launcher_nx_version_chip_test.lua | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ports/switch/ota-launcher/Makefile b/ports/switch/ota-launcher/Makefile index d468c86a..2f2c710d 100644 --- a/ports/switch/ota-launcher/Makefile +++ b/ports/switch/ota-launcher/Makefile @@ -162,6 +162,7 @@ $(BUILD): sync-romfs #--------------------------------------------------------------------------------- clean: @echo clean ... + @$(MAKE) --no-print-directory -C $(BOOTSTRAP_DIR) clean || true @rm -fr $(BUILD) $(TARGET).nro $(TARGET).nacp $(TARGET).elf $(TARGET).lst build-host @rm -f $(CURDIR)/$(ROMFS)/logo.rgba $(CURDIR)/$(ROMFS)/logo.png diff --git a/tests/engine/launcher_nx_version_chip_test.lua b/tests/engine/launcher_nx_version_chip_test.lua index 2a76e57e..9fefbb1b 100644 --- a/tests/engine/launcher_nx_version_chip_test.lua +++ b/tests/engine/launcher_nx_version_chip_test.lua @@ -16,9 +16,11 @@ assert(src:find('local Version = require%("src%.core%.Version"%)') assert(src:find("imp%.isNX", 1, false), "version chip must gate on isNX") --- The chip is inside an isNX block and prints Version.engine -local nxBlock = src:match("if imp%.isNX then(.-)end\n\n %-%- Settings gear") -assert(nxBlock, "expected Switch-only version chip before the settings gear") +-- The chip is inside an isNX block and prints Version.engine (layout between +-- the chip and the settings gear may change; anchor on the Switch-only comment). +local nxBlock = src:match( + "Switch%-only: show the running app version.-if imp%.isNX then(.-)end") +assert(nxBlock, "expected Switch-only version chip in the header row") assert(nxBlock:find("Version%.engine", 1, false), "chip must show Version.engine") assert(nxBlock:find('"v"', 1, true) or nxBlock:find('"v" %.%.', 1, false), "chip label should be a v-prefixed version")