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

Added autoexec append safe test/cmd timeout and/or exit code overrride.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -7s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-28 23:27:47 +02:00
parent a443040dff
commit b0bbb7ff1c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/make/mb_autoexec.mk
View file

@ -28,12 +28,12 @@ define mb_autoexec_append_exit
$(call mb_autoexec_append_cmd,$(1),omsxctl exit 0) $(call mb_autoexec_append_cmd,$(1),omsxctl exit 0)
endef endef
define mb_autoexec_append_safe_test define mb_autoexec_append_safe_test
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_TEST_TIMEOUT) seconds failed_test $(MB_AUTOEXEC_TEST_EXITCODE)) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_TEST_TIMEOUT)) seconds failed_test $(if $(4),$(4),$(MB_AUTOEXEC_TEST_EXITCODE)))
$(call mb_autoexec_append_echo,$(1),Running test: $(subst >,>,$(2))) $(call mb_autoexec_append_echo,$(1),Running test: $(subst >,>,$(2)))
$(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_cmd,$(1),$(2))
endef endef
define mb_autoexec_append_safe_cmd define mb_autoexec_append_safe_cmd
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_CMD_TIMEOUT) seconds failed_cmd $(MB_AUTOEXEC_CMD_EXITCODE)) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(if $(3),$(3),$(MB_AUTOEXEC_CMD_TIMEOUT)) seconds failed_cmd $(if $(4),$(4),$(MB_AUTOEXEC_CMD_EXITCODE)))
$(call mb_autoexec_append_echo,$(1),Running command: $(subst >,>,$(2))) $(call mb_autoexec_append_echo,$(1),Running command: $(subst >,>,$(2)))
$(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_cmd,$(1),$(2))
endef endef

4
test/dist-qa-msx1/0module.mk
View file

@ -21,8 +21,8 @@ test-dist-qa-msx1-assert: | $(TEST_DIST_QA_MSX1_DEPS)
$(call mb_delete,$(TEST_DIST_QA_MSX1)/ahello1.out) $(call mb_delete,$(TEST_DIST_QA_MSX1)/ahello1.out)
$(call mb_delete,$(TEST_DIST_QA_MSX1)/ahello2.out) $(call mb_delete,$(TEST_DIST_QA_MSX1)/ahello2.out)
$(call mb_autoexec_write_default,$(TEST_DIST_QA_MSX1),40) $(call mb_autoexec_write_default,$(TEST_DIST_QA_MSX1),40)
$(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSX1),ahello1 > ahello1.out) $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSX1),ahello1 > ahello1.out,33)
$(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSX1),ahello2 > ahello2.out) $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSX1),ahello2 > ahello2.out,66,99)
$(call mb_autoexec_append_exit,$(TEST_DIST_QA_MSX1)) $(call mb_autoexec_append_exit,$(TEST_DIST_QA_MSX1))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSX1),$(TEST_DIST_QA_MSX1_MACHINE)) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSX1),$(TEST_DIST_QA_MSX1_MACHINE))
grep "M80: Hello world..." $(TEST_DIST_QA_MSX1)/ahello1.out grep "M80: Hello world..." $(TEST_DIST_QA_MSX1)/ahello1.out