More colors.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 15s

This commit is contained in:
Willem Cazander 2024-07-14 22:58:47 +02:00
parent 1b799cfca2
commit 893c848d1d
6 changed files with 9 additions and 9 deletions

View file

@ -19,21 +19,21 @@ $(call mb_make_call,mb_doc_variable,MB_MSXPIPE_COLOR_BG_RUN_GUI,"Background colo
define mb_msxpipe_safe_cmd define mb_msxpipe_safe_cmd
$(MB_   )$(call mb_make_call,mb_autoexec_write_default,$(1),$(MB_MSXPIPE_COLOR_FG_SAFE_CMD),$(MB_MSXPIPE_COLOR_BG_SAFE_CMD)) $(MB_   )$(call mb_make_call,mb_autoexec_write_default,$(1),$(if $(4),$(4),$(MB_MSXPIPE_COLOR_FG_SAFE_CMD)),$(if $(),$(5),$(MB_MSXPIPE_COLOR_BG_SAFE_CMD)))
$(MB_   )$(call mb_make_call,mb_autoexec_append_safe_cmd,$(1),$(2)) $(MB_   )$(call mb_make_call,mb_autoexec_append_safe_cmd,$(1),$(2))
$(MB_   )$(call mb_make_call,mb_autoexec_append_exit,$(1)) $(MB_   )$(call mb_make_call,mb_autoexec_append_exit,$(1))
$(MB_   )$(call mb_make_call,mb_openmsx_dosctl,$(1),$(3)) $(MB_   )$(call mb_make_call,mb_openmsx_dosctl,$(1),$(3))
endef endef
$(call mb_make_call,mb_doc_function,mb_msxpipe_safe_cmd,"Runs openMSX and safely executes one command.","<dir> <cmd> [machine]") $(call mb_make_call,mb_doc_function,mb_msxpipe_safe_cmd,"Runs openMSX and safely executes one command.","<dir> <cmd> [machine] [fg-color] [bg-color]")
define mb_msxpipe_safe_assert define mb_msxpipe_safe_assert
$(MB_   )$(call mb_make_call,mb_autoexec_write_default,$(1),$(MB_MSXPIPE_COLOR_FG_SAFE_ASSERT),$(MB_MSXPIPE_COLOR_BG_SAFE_ASSERT)) $(MB_   )$(call mb_make_call,mb_autoexec_write_default,$(1),$(if $(4),$(4),$(MB_MSXPIPE_COLOR_FG_SAFE_ASSERT)),$(if $(5),$(5),$(MB_MSXPIPE_COLOR_BG_SAFE_ASSERT)))
$(MB_   )$(call mb_make_call,mb_autoexec_append_safe_assert,$(1),$(2)) $(MB_   )$(call mb_make_call,mb_autoexec_append_safe_assert,$(1),$(2))
$(MB_   )$(call mb_make_call,mb_autoexec_append_exit,$(1)) $(MB_   )$(call mb_make_call,mb_autoexec_append_exit,$(1))
$(MB_   )$(call mb_make_call,mb_openmsx_dosctl,$(1),$(3)) $(MB_   )$(call mb_make_call,mb_openmsx_dosctl,$(1),$(3))
endef endef
$(call mb_make_call,mb_doc_function,mb_msxpipe_safe_assert,"Runs openMSX and safely executes one assert.","<dir> <cmd> [machine]") $(call mb_make_call,mb_doc_function,mb_msxpipe_safe_assert,"Runs openMSX and safely executes one assert.","<dir> <cmd> [machine] [fg-color] [bg-color]")
define _mb_msxpipe_run_gui define _mb_msxpipe_run_gui

View file

@ -42,7 +42,7 @@ $(ASSERT_MSXHUB_BIN)/@assert: | $(ASSERT_MSXHUB_BIN)
_$(MB_  )$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/ahello1.out) _$(MB_  )$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/ahello1.out)
_$(MB_  )$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/ahello2.out) _$(MB_  )$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/ahello2.out)
_$(MB_  )$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/utils.out) _$(MB_  )$(call mb_make_call,mb_os_file_delete,$(ASSERT_MSXHUB_BIN)/utils.out)
_$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(ASSERT_MSXHUB_BIN)) _$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(ASSERT_MSXHUB_BIN),336)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(ASSERT_MSXHUB_BIN),dir utils > utils.out) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(ASSERT_MSXHUB_BIN),dir utils > utils.out)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_exit,$(ASSERT_MSXHUB_BIN)) _$(MB_  )$(call mb_make_call,mb_autoexec_append_exit,$(ASSERT_MSXHUB_BIN))
_$(MB_  )$(call mb_make_call,mb_openmsx_dosctl,$(ASSERT_MSXHUB_BIN),$(ASSERT_MSXHUB_MACHINE)) _$(MB_  )$(call mb_make_call,mb_openmsx_dosctl,$(ASSERT_MSXHUB_BIN),$(ASSERT_MSXHUB_MACHINE))

View file

@ -7,7 +7,7 @@ $(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),$(EXAMP
$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@build $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)/@build
_$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN)) _$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),515)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello1) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello1)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello2) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello2)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello3) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS1_BIN),hello3)

View file

@ -9,7 +9,7 @@ $(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),$(EXAMP
$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@build $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/@build
_$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello1.out) _$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello1.out)
_$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello2.out) _$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)/ahello2.out)
_$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN)) _$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),515)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello1 > hello1.out) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello1 > hello1.out)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello2 > hello2.out) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello2 > hello2.out)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello3 > hello3.out) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_DOS2_BIN),hello3 > hello3.out)

View file

@ -12,7 +12,7 @@ $(call mb_make_call,mb_flow_clone_deps,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),$(EXAMP
$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@build $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@assert: $(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/@build
_$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello1.out) _$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello1.out)
_$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello2.out) _$(MB_  )$(call mb_make_call,mb_os_file_delete,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN)/ahello2.out)
_$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),40) _$(MB_  )$(call mb_make_call,mb_autoexec_write_default,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),515)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello1 > hello1.out,33) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello1 > hello1.out,33)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello2 > hello2.out,66,99) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello2 > hello2.out,66,99)
_$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello3 > hello3.out,50,100) _$(MB_  )$(call mb_make_call,mb_autoexec_append_safe_assert,$(EXAMPLE_DIST_HELLO_QA_MSX1_BIN),hello3 > hello3.out,50,100)

View file

@ -32,7 +32,7 @@ $(MB_   )$(call mb_make_call,mb_proj_grow_deps_phase,@process,$(E
$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/build.bat $(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com: $(EXAMPLE_HELLO_MAKE4MSX_BIN)/build.bat
_$(MB_  )$(call mb_make_call,mb_msxpipe_safe_cmd,$(EXAMPLE_HELLO_MAKE4MSX_BIN),build shutdown) _$(MB_  )$(call mb_make_call,mb_msxpipe_safe_cmd,$(EXAMPLE_HELLO_MAKE4MSX_BIN),build shutdown,,662)
$(MB_   )$(call mb_make_call,mb_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com) $(MB_   )$(call mb_make_call,mb_doc_target_deep,$(EXAMPLE_HELLO_MAKE4MSX_BIN)/hello.com)