From b0bbb7ff1c6298f47214db82a9b98a487e10605b Mon Sep 17 00:00:00 2001 From: Willem Date: Fri, 28 Jun 2024 23:27:47 +0200 Subject: [PATCH] Added autoexec append safe test/cmd timeout and/or exit code overrride. --- lib/make/mb_autoexec.mk | 4 ++-- test/dist-qa-msx1/0module.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk index fab619c..6d61f2e 100644 --- a/lib/make/mb_autoexec.mk +++ b/lib/make/mb_autoexec.mk @@ -28,12 +28,12 @@ define mb_autoexec_append_exit $(call mb_autoexec_append_cmd,$(1),omsxctl exit 0) endef 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_cmd,$(1),$(2)) endef 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_cmd,$(1),$(2)) endef diff --git a/test/dist-qa-msx1/0module.mk b/test/dist-qa-msx1/0module.mk index 43f9c63..9d38a0c 100644 --- a/test/dist-qa-msx1/0module.mk +++ b/test/dist-qa-msx1/0module.mk @@ -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)/ahello2.out) $(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),ahello2 > ahello2.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,66,99) $(call mb_autoexec_append_exit,$(TEST_DIST_QA_MSX1)) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSX1),$(TEST_DIST_QA_MSX1_MACHINE)) grep "M80: Hello world..." $(TEST_DIST_QA_MSX1)/ahello1.out