Moved asserts to remove copy of mofified files after assert.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -9s

This commit is contained in:
Willem Cazander 2024-06-30 04:07:10 +02:00
parent b175f499d4
commit 6f677b6c43
10 changed files with 181 additions and 141 deletions

View file

@ -1,55 +1,57 @@
DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP
DIST_QA_MSXHUB := $(PATH_BIN)/dist-qa-msxhub
DIST_QA_MSXHUB_DEPS := $(subst dist,dist-qa-msxhub,$(DIST_DEPS))
BUILD_HELP += \\n\\t* dist-qa-msxhub-run\\n\\t* dist-qa-msxhub-assert
DIST_QA_MSXHUB_MOD := dist-qa-msxhub
DIST_QA_MSXHUB_SRC := $(PATH_SRC)/$(DIST_QA_MSXHUB_MOD)
DIST_QA_MSXHUB_BIN := $(PATH_BIN)/$(DIST_QA_MSXHUB_MOD)
DIST_QA_MSXHUB_DEPS := $(subst dist,$(DIST_QA_MSXHUB_MOD),$(DIST_DEPS))
BUILD_HELP += \\n\\t* $(DIST_QA_MSXHUB_BIN)/@run\\n\\t* $(DIST_QA_MSXHUB_BIN)/@assert
$(DIST_QA_MSXHUB):
$(call mb_mkdir,$(DIST_QA_MSXHUB))
$(call mb_mkdir,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_dos2_utils,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_macro80,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_konpass,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_lhext,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_popcom,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_make,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_adir,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_turbo,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_baskom,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_binldr,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_zd,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB)/utils)
$(DIST_QA_MSXHUB_BIN):
$(call mb_mkdir,$(DIST_QA_MSXHUB_BIN))
$(call mb_mkdir,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_dos2_utils,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_nextor_utils,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_macro80,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_z80asmuk,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_wbass2,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_konpass,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_pmarc,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_lhpack,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_lhext,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_gunzip,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_tunzip,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_popcom,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_make,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_adir,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_turbo,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_baskom,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_binldr,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_dmphex,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_zd,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_msxdos2t,$(DIST_QA_MSXHUB_BIN)/utils)
$(call mb_msxhub_get_gfxage,$(DIST_QA_MSXHUB_BIN)/utils)
$(DIST_QA_MSXHUB)/%: bin/dist/% | $(DIST_QA_MSXHUB) $(DIST_DEPS)
$(DIST_QA_MSXHUB_BIN)/%: $(DIST_BIN)/% | $(DIST_QA_MSXHUB_BIN) $(DIST_DEPS)
$(call mb_copy,$<,$@)
.PHONY: dist-qa-msxhub-run
dist-qa-msxhub-run: | $(DIST_QA_MSXHUB_DEPS)
$(call mb_autoexec_show_gui80,$(DIST_QA_MSXHUB),dir/w)
$(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB),$(DIST_QA_MSXHUB_MACHINE))
.PHONY: $(DIST_QA_MSXHUB_BIN)/@run
$(DIST_QA_MSXHUB_BIN)/@run: | $(DIST_QA_MSXHUB_DEPS)
$(call mb_autoexec_show_gui80,$(DIST_QA_MSXHUB_BIN),dir/w)
$(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_BIN_MACHINE))
.PHONY: dist-qa-msxhub-assert
dist-qa-msxhub-assert: | $(DIST_QA_MSXHUB_DEPS)
$(call mb_delete,$(DIST_QA_MSXHUB)/ahello1.out)
$(call mb_delete,$(DIST_QA_MSXHUB)/ahello2.out)
$(call mb_delete,$(DIST_QA_MSXHUB)/utils.out)
$(call mb_autoexec_write_default,$(DIST_QA_MSXHUB),80)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),ahello1 > ahello1.out)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),ahello2 > ahello2.out)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB),dir utils > utils.out)
$(call mb_autoexec_append_cmd,$(DIST_QA_MSXHUB),dir/w)
$(call mb_autoexec_append_exit,$(DIST_QA_MSXHUB))
$(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB),$(DIST_QA_MSXHUB_MACHINE))
grep "M80: Hello world..." $(DIST_QA_MSXHUB)/ahello1.out
grep "SDCC: Hello world..." $(DIST_QA_MSXHUB)/ahello2.out
grep "KONPASS COM" $(DIST_QA_MSXHUB)/utils.out
grep "MAKE COM" $(DIST_QA_MSXHUB)/utils.out
.PHONY: $(DIST_QA_MSXHUB_BIN)/@assert
$(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS)
$(call mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello1.out)
$(call mb_delete,$(DIST_QA_MSXHUB_BIN)/ahello2.out)
$(call mb_delete,$(DIST_QA_MSXHUB_BIN)/utils.out)
$(call mb_autoexec_write_default,$(DIST_QA_MSXHUB_BIN),80)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello1 > ahello1.out)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),ahello2 > ahello2.out)
$(call mb_autoexec_append_safe_test,$(DIST_QA_MSXHUB_BIN),dir utils > utils.out)
$(call mb_autoexec_append_cmd,$(DIST_QA_MSXHUB_BIN),dir/w)
$(call mb_autoexec_append_exit,$(DIST_QA_MSXHUB_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_MSXHUB_BIN),$(DIST_QA_MSXHUB_BIN_MACHINE))
grep "M80: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello1.out
grep "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out
grep "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out
grep "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out