Fixed dos1 and msx1 runs.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -4s

This commit is contained in:
Willem Cazander 2024-06-27 19:09:38 +02:00
parent 567f91be78
commit 80f751cfea
11 changed files with 63 additions and 56 deletions

View file

@ -12,25 +12,25 @@ $(TEST_AHELLO_M80)/%.mac: test/ahello-m80/%.mac | $(TEST_AHELLO_M80)
$(call mb_unix2dos,$<,$@)
$(TEST_AHELLO_M80)/ahello.rel: $(TEST_AHELLO_M80)/ahello.mac
$(call mb_autoexec_cmd,$(TEST_AHELLO_M80),m80 =ahello/Z)
$(call mb_autoexec_safe_cmd,$(TEST_AHELLO_M80),m80 =ahello/Z)
$(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
$(TEST_AHELLO_M80)/ahello.hex: $(TEST_AHELLO_M80)/ahello.rel
$(call mb_autoexec_cmd,$(TEST_AHELLO_M80),l80 ahello$(MB_COMMA)ahello/N/X/Y/E)
$(call mb_autoexec_safe_cmd,$(TEST_AHELLO_M80),l80 ahello$(MB_COMMA)ahello/N/X/Y/E)
$(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
$(TEST_AHELLO_M80)/ahello.com: $(TEST_AHELLO_M80)/ahello.hex
$(call mb_autoexec_cmd,$(TEST_AHELLO_M80),hextocom ahello)
$(call mb_autoexec_safe_cmd,$(TEST_AHELLO_M80),hextocom ahello)
$(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
.PHONY: test-ahello-m80-run
test-ahello-m80-run: $(TEST_AHELLO_M80)/ahello.com
$(call mb_autoexec_open_gui,$(TEST_AHELLO_M80))
$(call mb_autoexec_open_gui80,$(TEST_AHELLO_M80))
$(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
.PHONY: test-ahello-m80-assert
test-ahello-m80-assert: $(TEST_AHELLO_M80)/ahello.com
$(call mb_delete,$(TEST_AHELLO_M80)/ahello.out)
$(call mb_autoexec_cmd_test,$(TEST_AHELLO_M80),ahello > ahello.out)
$(call mb_autoexec_safe_test,$(TEST_AHELLO_M80),ahello > ahello.out)
$(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
grep "M80: Hello world..." $(TEST_AHELLO_M80)/ahello.out

View file

@ -18,12 +18,12 @@ $(TEST_AHELLO_SDCC)/ahello.com: $(TEST_AHELLO_SDCC)/ahello.hex
.PHONY: test-ahello-sdcc-run
test-ahello-sdcc-run: $(TEST_AHELLO_SDCC)/ahello.com
$(call mb_autoexec_open_gui,$(TEST_AHELLO_SDCC))
$(call mb_autoexec_open_gui80,$(TEST_AHELLO_SDCC))
$(call mb_openmsx_dosctl,$(TEST_AHELLO_SDCC))
.PHONY: test-ahello-sdcc-assert
test-ahello-sdcc-assert: $(TEST_AHELLO_SDCC)/ahello.com
$(call mb_delete,$(TEST_AHELLO_SDCC)/ahello.out)
$(call mb_autoexec_cmd_test,$(TEST_AHELLO_SDCC),ahello > ahello.out)
$(call mb_autoexec_safe_test,$(TEST_AHELLO_SDCC),ahello > ahello.out)
$(call mb_openmsx_dosctl,$(TEST_AHELLO_SDCC))
grep "SDCC: Hello world..." $(TEST_AHELLO_SDCC)/ahello.out

View file

@ -13,7 +13,7 @@ $(TEST_DIST_QA_DOS1)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS1) $(TEST_DIST_DEPS)
.PHONY: test-dist-qa-dos1-run
test-dist-qa-dos1-run: | $(TEST_DIST_QA_DOS1_DEPS)
$(call mb_autoexec_open_gui,$(TEST_DIST_QA_DOS1))
$(call mb_autoexec_open_gui80,$(TEST_DIST_QA_DOS1))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_DOS1))
.PHONY: test-dist-qa-dos1-assert

View file

@ -13,7 +13,7 @@ $(TEST_DIST_QA_DOS2)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS2) $(TEST_DIST_DEPS)
.PHONY: test-dist-qa-dos2-run
test-dist-qa-dos2-run: | $(TEST_DIST_QA_DOS2_DEPS)
$(call mb_autoexec_open_gui,$(TEST_DIST_QA_DOS2))
$(call mb_autoexec_open_gui80,$(TEST_DIST_QA_DOS2))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_DOS2))
.PHONY: test-dist-qa-dos2-assert

View file

@ -14,9 +14,7 @@ $(TEST_DIST_QA_MSX1)/%: bin/test/dist/% | $(TEST_DIST_QA_MSX1) $(TEST_DIST_DEPS)
.PHONY: test-dist-qa-msx1-run
test-dist-qa-msx1-run: | $(TEST_DIST_QA_MSX1_DEPS)
$(call mb_autoexec_write_default,$(TEST_DIST_QA_MSX1),40)
$(call mb_autoexec_append_stop_fail,$(TEST_DIST_QA_MSX1))
$(call mb_autoexec_append_gui_mode,$(TEST_DIST_QA_MSX1))
$(call mb_autoexec_open_gui40,$(TEST_DIST_QA_MSX1))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSX1),$(TEST_DIST_QA_MSX1_MACHINE))
.PHONY: test-dist-qa-msx1-assert