Enabled auto path to A:\UTILS + added test for msxhub packages.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 11s

This commit is contained in:
Willem Cazander 2024-06-29 02:49:16 +02:00
parent 92b8aa9a06
commit 598d673d91
9 changed files with 82 additions and 38 deletions

View file

@ -5,7 +5,8 @@ test-ahello-m80-assert \
test-ahello-sdcc-assert \
test-dist-qa-dos1-assert \
test-dist-qa-dos2-assert \
test-dist-qa-msx1-assert
test-dist-qa-msx1-assert \
test-dist-qa-msxhub-assert
.PHONY: assert-all
assert-all: | $(BUILD_TEST)

View file

@ -4,7 +4,9 @@ BUILD_HELP += \\n\\t* $(TEST_AHELLO_M80)/ahello.com\\n\\t* test-ahello-m8
$(TEST_AHELLO_M80):
$(call mb_mkdir,$(TEST_AHELLO_M80))
$(call mb_msxhub_get_macro80,$(TEST_AHELLO_M80))
$(call mb_mkdir,$(TEST_AHELLO_M80)/utils)
$(call mb_msxhub_get_macro80,$(TEST_AHELLO_M80)/utils)
$(call mb_msxhub_get_z80asmuk,$(TEST_AHELLO_M80)/utils)
$(TEST_AHELLO_M80)/%.mac: test/ahello-m80/%.mac | $(TEST_AHELLO_M80)
$(call mb_unix2dos,$<,$@)

View file

@ -5,7 +5,7 @@ BUILD_HELP += \\n\\t* test-dist-qa-dos1-run\\n\\t* test-dist-qa-dos
$(TEST_DIST_QA_DOS1):
$(call mb_mkdir,$(TEST_DIST_QA_DOS1))
$(call mb_msxhub_getboot_dos1,$(TEST_DIST_QA_DOS1))
$(call mb_msxhub_get_dos1_boot,$(TEST_DIST_QA_DOS1))
$(TEST_DIST_QA_DOS1)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS1) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)

View file

@ -5,7 +5,7 @@ BUILD_HELP += \\n\\t* test-dist-qa-dos2-run\\n\\t* test-dist-qa-dos
$(TEST_DIST_QA_DOS2):
$(call mb_mkdir,$(TEST_DIST_QA_DOS2))
$(call mb_msxhub_getboot_dos2,$(TEST_DIST_QA_DOS2))
$(call mb_msxhub_get_dos2_boot,$(TEST_DIST_QA_DOS2))
$(TEST_DIST_QA_DOS2)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS2) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)

View file

@ -0,0 +1,46 @@
TEST_DIST_QA_MSXHUB_MACHINE ?= Boosted_MSX2+_JP
TEST_DIST_QA_MSXHUB := $(PATH_BIN)/test/dist-qa-msxhub
TEST_DIST_QA_MSXHUB_DEPS := $(subst dist,dist-qa-msxhub,$(TEST_DIST_DEPS))
BUILD_HELP += \\n\\t* test-dist-qa-msxhub-run\\n\\t* test-dist-qa-msxhub-assert
$(TEST_DIST_QA_MSXHUB):
$(call mb_mkdir,$(TEST_DIST_QA_MSXHUB))
$(call mb_mkdir,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_dos2_utils,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_nextor_utils,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_macro80,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_z80asmuk,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_pmarc,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_lhpack,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_lhext,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_gunzip,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_tunzip,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_popcom,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_adir,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_turbo,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_baskom,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_binldr,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_dmphex,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_msxdos2t,$(TEST_DIST_QA_MSXHUB)/utils)
$(call mb_msxhub_get_gfxage,$(TEST_DIST_QA_MSXHUB)/utils)
$(TEST_DIST_QA_MSXHUB)/%: bin/test/dist/% | $(TEST_DIST_QA_MSXHUB) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)
.PHONY: test-dist-qa-msxhub-run
test-dist-qa-msxhub-run: | $(TEST_DIST_QA_MSXHUB_DEPS)
$(call mb_autoexec_open_gui80,$(TEST_DIST_QA_MSXHUB))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSXHUB),$(TEST_DIST_QA_MSXHUB_MACHINE))
.PHONY: test-dist-qa-msxhub-assert
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_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
grep "SDCC: Hello world..." $(TEST_DIST_QA_MSXHUB)/ahello2.out