diff --git a/lib/make/mb_autoexec.mk b/lib/make/mb_autoexec.mk index 4a07bf1..dcd1e32 100644 --- a/lib/make/mb_autoexec.mk +++ b/lib/make/mb_autoexec.mk @@ -51,8 +51,8 @@ define mb_autoexec_write_default $(if $(filter 40,$(2)),$(call mb_autoexec_append_cmd,$(1),mode 40),$(call mb_autoexec_append_cmd,$(1),mode 80)) $(call mb_autoexec_append_echo,$(1),==== MSXBUILD ====) $(if $(filter 40,$(2)),$(call mb_autoexec_append_echo,$(1),Boot mode 40),$(call mb_autoexec_append_echo,$(1),Boot mode 80)) - $(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_autoexec_append_save_video,$(1))) $(call mb_autoexec_append_cmd,$(1),omsxctl boot_exec_color_dark) + $(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_autoexec_append_save_video,$(1))) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_exec $(MB_AUTOEXEC_STARTUP_EXITCODE)) $(if $(filter on,$(MB_AUTOEXEC_VERSION)),$(call mb_autoexec_append_cmd,$(1),ver)) $(if $(wildcard $(1)/utils),$(call mb_autoexec_append_cmd,$(1),PATH + A:\)) diff --git a/test/dist-qa-msxhub/0module.mk b/test/dist-qa-msxhub/0module.mk index 4a36e14..62d1f3e 100644 --- a/test/dist-qa-msxhub/0module.mk +++ b/test/dist-qa-msxhub/0module.mk @@ -42,8 +42,10 @@ test-dist-qa-msxhub-assert: | $(TEST_DIST_QA_MSXHUB_DEPS) $(call mb_delete,$(TEST_DIST_QA_MSXHUB)/ahello1.out) $(call mb_delete,$(TEST_DIST_QA_MSXHUB)/ahello2.out) $(call mb_autoexec_write_default,$(TEST_DIST_QA_MSXHUB),80) - $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello1 > ahello1.out,33) - $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello2 > ahello2.out,66,99) + $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello1 > ahello1.out) + $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello2 > ahello2.out) + $(call mb_autoexec_append_cmd,$(TEST_DIST_QA_MSXHUB),dir) + $(call mb_autoexec_append_cmd,$(TEST_DIST_QA_MSXHUB),dir/w utils) $(call mb_autoexec_append_exit,$(TEST_DIST_QA_MSXHUB)) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSXHUB),$(TEST_DIST_QA_MSXHUB_MACHINE)) grep "M80: Hello world..." $(TEST_DIST_QA_MSXHUB)/ahello1.out