diff options
| author | Nick Brassel <nick@tzarc.org> | 2022-02-05 12:51:23 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-05 12:51:23 +1100 |
| commit | d31dd6d2a0b226193439696a8483edfaacf00450 (patch) | |
| tree | c88030fc4e46662c87a0333338be38aeeeb0151e | |
| parent | 28fbcac6c903100bb78bf7a30f138c7d6c42ec68 (diff) | |
| download | qmk_firmware-d31dd6d2a0b226193439696a8483edfaacf00450.tar.gz qmk_firmware-d31dd6d2a0b226193439696a8483edfaacf00450.zip | |
Followup to #16220, more test error output. (#16221)
| -rw-r--r-- | platforms/avr/platform.mk | 2 | ||||
| -rw-r--r-- | platforms/chibios/platform.mk | 2 | ||||
| -rw-r--r-- | testlist.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk index b45108736f..4d9cafaeef 100644 --- a/platforms/avr/platform.mk +++ b/platforms/avr/platform.mk @@ -159,7 +159,7 @@ endif bootloader: ifeq ($(strip $(QMK_BOOTLOADER_TYPE)),) - $(error Please set BOOTLOADER to "qmk-dfu" or "qmk-hid" first!) + $(call CATASTROPHIC_ERROR,Invalid BOOTLOADER,Please set BOOTLOADER to "qmk-dfu" or "qmk-hid" first!) else make -C lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/ clean $(QMK_BIN) generate-dfu-header --quiet --keyboard $(KEYBOARD) --output lib/lufa/Bootloaders/$(QMK_BOOTLOADER_TYPE)/Keyboard.h diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index 45e3377882..6fd1fd83f5 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -344,7 +344,7 @@ ifeq ($(strip $(MCU)), risc-v) ifneq ($(shell which riscv64-unknown-elf-gcc 2>/dev/null),) TOOLCHAIN = riscv64-unknown-elf- else - $(error "No RISC-V toolchain found. Can't find riscv32-unknown-elf-gcc or riscv64-unknown-elf-gcc found in your systems PATH variable. Please install a valid toolchain and make it accessible!") + $(call CATASTROPHIC_ERROR,Missing toolchain,No RISC-V toolchain found. Can't find riscv32-unknown-elf-gcc or riscv64-unknown-elf-gcc found in your systems PATH variable. Please install a valid toolchain and make it accessible!) endif endif endif diff --git a/testlist.mk b/testlist.mk index 904485c15c..86da5668ac 100644 --- a/testlist.mk +++ b/testlist.mk @@ -8,7 +8,7 @@ include $(PLATFORM_PATH)/test/testlist.mk define VALIDATE_TEST_LIST ifneq ($1,) ifeq ($$(findstring -,$1),-) - $$(error Test names can't contain '-', but '$1' does) + $$(call CATASTROPHIC_ERROR,Invalid test name,Test names can't contain '-', but '$1' does.) else $$(eval $$(call VALIDATE_TEST_LIST,$$(firstword $2),$$(wordlist 2,9999,$2))) endif |