arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

Shorted failure ids for no wrap on 40 column mode.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 3s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-07-02 21:04:16 +02:00
parent 055a8f3b36
commit 0ed79edd77
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/make/mb_autoexec.mk
View file

@ -85,14 +85,14 @@ endef
MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_save_video,"Appends save video command.","<dir> [prefix]") MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_save_video,"Appends save video command.","<dir> [prefix]")
define mb_autoexec_append_safe_test define mb_autoexec_append_safe_test
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_TEST_TIMEOUT)) seconds failed_test $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_TEST_EXITCODE))) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_TEST_TIMEOUT)) seconds err_test $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_TEST_EXITCODE)))
$(call mb_autoexec_append_echo,$(1),mb::safe test $(2)) $(call mb_autoexec_append_echo,$(1),mb::safe test $(2))
$(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_cmd,$(1),$(2))
endef endef
MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_safe_test,"Appends running a safe test.","<dir> <cmd> [timeout] [exit-code]") MB_DOC_HELP_FUNCTION += $(call mb_doc_function,mb_autoexec_append_safe_test,"Appends running a safe test.","<dir> <cmd> [timeout] [exit-code]")
define mb_autoexec_append_safe_cmd define mb_autoexec_append_safe_cmd
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_CMD_TIMEOUT)) seconds failed_cmd $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_CMD_EXITCODE))) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_SAFE_CMD_TIMEOUT)) seconds err_cmd $(if $(4),$(4),$(MB_AUTOEXEC_SAFE_CMD_EXITCODE)))
$(call mb_autoexec_append_echo,$(1),mb::safe command $(2)) $(call mb_autoexec_append_echo,$(1),mb::safe command $(2))
$(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_cmd,$(1),$(2))
endef endef
@ -102,7 +102,7 @@ define _mb_autoexec_write_preboot
$(call mb_autoexec_append_cmd,$(1),$(2)mbboot80) $(call mb_autoexec_append_cmd,$(1),$(2)mbboot80)
$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl boot_exec_color_vdp) $(call mb_autoexec_append_cmd,$(1),$(2)omsxctl boot_exec_color_vdp)
$(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_autoexec_append_save_video,$(1))) $(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_autoexec_append_save_video,$(1)))
$(call mb_autoexec_append_cmd,$(1),$(2)omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_exec $(MB_AUTOEXEC_STARTUP_EXITCODE)) $(call mb_autoexec_append_cmd,$(1),$(2)omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds err_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
endef endef
define mb_autoexec_write_default define mb_autoexec_write_default

2
lib/make/mb_msxpipe.mk
View file

@ -20,7 +20,7 @@ define _mb_msxpipe_run_gui
$(call mb_autoexec_append_stop_fail,$(1)) $(call mb_autoexec_append_stop_fail,$(1))
$(call mb_autoexec_append_show_gui,$(1)) $(call mb_autoexec_append_show_gui,$(1))
$(if $(filter mouse,$(4)),$(call mb_autoexec_append_joyporta_mouse,$(1))) $(if $(filter mouse,$(4)),$(call mb_autoexec_append_joyporta_mouse,$(1)))
$(call mb_autoexec_append_echo,$(1),mb::help Run shutdown to stop emulation) $(call mb_autoexec_append_echo,$(1),mb::help Run shutdown to exit)
$(if $(2),$(call mb_autoexec_append_echo,$(1),mb::show command $(2))) $(if $(2),$(call mb_autoexec_append_echo,$(1),mb::show command $(2)))
$(if $(2),$(call mb_autoexec_append_cmd,$(1),$(2))) $(if $(2),$(call mb_autoexec_append_cmd,$(1),$(2)))
$(call mb_openmsx_dosctl,$(1),$(3)) $(call mb_openmsx_dosctl,$(1),$(3))

2
lib/openmsx/share/scripts/fail_after.tcl
View file

@ -62,7 +62,7 @@ proc fail_after { timeout {time_unit "time"} {fail_id "fail_after"} {fail_code 2
proc fail_after_reboot_watchdog {} { proc fail_after_reboot_watchdog {} {
global fail_after_boot_timeout global fail_after_boot_timeout
if {$fail_after_boot_timeout != 0} { if {$fail_after_boot_timeout != 0} {
fail_after $fail_after_boot_timeout realtime failed_boot 124 fail_after $fail_after_boot_timeout realtime err_boot 124
after boot "fail_after_reboot_watchdog" after boot "fail_after_reboot_watchdog"
} }
} }