Browse Source

Print correct test names (#26160)

Joel Challis 3 months ago
parent
commit
21c193f77b
2 changed files with 3 additions and 2 deletions
  1. 1 0
      Makefile
  2. 2 2
      builddefs/message.mk

+ 1 - 0
Makefile

@@ -300,6 +300,7 @@ endef
 define BUILD_TEST
 define BUILD_TEST
     TEST_PATH := $1
     TEST_PATH := $1
     TEST_NAME := $$(notdir $$(TEST_PATH))
     TEST_NAME := $$(notdir $$(TEST_PATH))
+    TEST_ID := $$(patsubst ./tests/%,%,$$(TEST_PATH))
     TEST_FULL_NAME := $$(subst /,_,$$(patsubst $$(ROOT_DIR)tests/%,%,$$(TEST_PATH)))
     TEST_FULL_NAME := $$(subst /,_,$$(patsubst $$(ROOT_DIR)tests/%,%,$$(TEST_PATH)))
     MAKE_TARGET := $2
     MAKE_TARGET := $2
     COMMAND := $1
     COMMAND := $1

+ 2 - 2
builddefs/message.mk

@@ -77,13 +77,13 @@ define GENERATE_MSG_MAKE_KB
 endef
 endef
 MSG_MAKE_KB = $(eval $(call GENERATE_MSG_MAKE_KB))$(MSG_MAKE_KB_ACTUAL)
 MSG_MAKE_KB = $(eval $(call GENERATE_MSG_MAKE_KB))$(MSG_MAKE_KB_ACTUAL)
 define GENERATE_MSG_MAKE_TEST
 define GENERATE_MSG_MAKE_TEST
-    MSG_MAKE_TEST_ACTUAL := Making test $(BOLD)$(TEST_NAME)$(NO_COLOR)
+    MSG_MAKE_TEST_ACTUAL := Making test $(BOLD)$(TEST_ID)$(NO_COLOR)
     ifneq ($$(MAKE_TARGET),)
     ifneq ($$(MAKE_TARGET),)
         MSG_MAKE_TEST_ACTUAL += with target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR)
         MSG_MAKE_TEST_ACTUAL += with target $(BOLD)$$(MAKE_TARGET)$(NO_COLOR)
     endif
     endif
 endef
 endef
 MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL)
 MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL)
-MSG_TEST = Testing $(BOLD)$(TEST_NAME)$(NO_COLOR)
+MSG_TEST = Testing $(BOLD)$(TEST_ID)$(NO_COLOR)
 define GENERATE_MSG_AVAILABLE_KEYMAPS
 define GENERATE_MSG_AVAILABLE_KEYMAPS
     MSG_AVAILABLE_KEYMAPS_ACTUAL := Available keymaps for $(BOLD)$$(CURRENT_KB)$(NO_COLOR):
     MSG_AVAILABLE_KEYMAPS_ACTUAL := Available keymaps for $(BOLD)$$(CURRENT_KB)$(NO_COLOR):
 endef
 endef