arch-msx/msxbuild
2
0
Fork 0
Code Issues Pull requests 3 Actions Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.forgejo/workflows/run-test-asserts.yaml
View file

@ -11,4 +11,4 @@ jobs:
- name: Check out - name: Check out
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Run asserts - name: Run asserts
run: make assert-all run: make -s -j4 assert-all

15
.forgejo/workflows/run-test-parallel.yaml
View file

@ -1,15 +0,0 @@
name: Run tests parallel
on:
pull_request:
types: [opened, reopened, synchronize]
branches:
- test_ci_parallel_build
workflow_dispatch:
jobs:
Test-Asserts-Parallel:
runs-on: self-hosted
steps:
- name: Check out
uses: actions/checkout@v3
- name: Run asserts parallel
run: make -j2 assert-all

22
README.md
View file

@ -98,17 +98,31 @@ Current set is WIP.
* mb_package_turbo * mb_package_turbo
* mb_package_binldr * mb_package_binldr
* mb_package_gfxage * mb_package_gfxage
* mb_msxrom_file
* mb_msxrom_setup
* mb_msxrom_extension_ide_nextor
* mb_msxrom_extension_rs232
* mb_msxrom_extension_fmpac
* mb_msxrom_extension_moonsound
* mb_msxrom_extension_basickun
* mb_msxrom_machine_Canon_V-20
* mb_msxrom_machine_Philips_NMS_8250
* mb_msxrom_machine_Boosted_MSX2_EN
* mb_autoexec_append_cmd * mb_autoexec_append_cmd
* mb_autoexec_append_echo * mb_autoexec_append_echo
* mb_autoexec_append_rem * mb_autoexec_append_rem
* mb_autoexec_append_gui_mode * mb_autoexec_append_gui_mode
* mb_autoexec_append_stop_fail * mb_autoexec_append_stop_fail
* mb_autoexec_append_exit * mb_autoexec_append_exit
* mb_autoexec_append_safe_test
* mb_autoexec_append_safe_cmd
* mb_autoexec_write_default * mb_autoexec_write_default
* mb_autoexec_open_gui * mb_autoexec_open_gui40
* mb_autoexec_open_gui_cmd * mb_autoexec_open_gui40_cmd
* mb_autoexec_cmd * mb_autoexec_open_gui80
* mb_autoexec_cmd_test * mb_autoexec_open_gui80_cmd
* mb_autoexec_safe_cmd
* mb_autoexec_safe_test
* mb_clean * mb_clean
* mb_mkdir * mb_mkdir
* mb_delete * mb_delete

48
lib/make/mb_autoexec.mk
View file

@ -20,9 +20,9 @@ define mb_autoexec_append_rem
endef endef
define mb_autoexec_append_gui_mode define mb_autoexec_append_gui_mode
$(call mb_autoexec_append_echo,$(1),Enabling SDL renderer.) $(call mb_autoexec_append_echo,$(1),Enabling SDL renderer.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set renderer SDL > NUL) $(call mb_autoexec_append_cmd,$(1),omsxctl set renderer SDL)
$(call mb_autoexec_append_echo,$(1),Enabling CPU throttling.) $(call mb_autoexec_append_echo,$(1),Enabling CPU throttling.)
$(call mb_autoexec_append_cmd,$(1),omsxctl set throttle on > NUL) $(call mb_autoexec_append_cmd,$(1),omsxctl set throttle on)
endef endef
define mb_autoexec_append_stop_fail define mb_autoexec_append_stop_fail
$(call mb_autoexec_append_echo,$(1),Disabling automatic failure.) $(call mb_autoexec_append_echo,$(1),Disabling automatic failure.)
@ -42,37 +42,45 @@ define mb_autoexec_append_safe_cmd
$(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_cmd,$(1),$(2))
endef endef
define mb_autoexec_write_default define mb_autoexec_write_default
echo -n "" > $(1)/autoexec.bat @echo === Writing autoexec.bat for $(notdir $(1))
$(if $(filter 40,$(2)),$(call mb_autoexec_append_cmd,$(1),mode $(2)),$(call mb_autoexec_append_cmd,$(1),mode 80)) @echo -n "" > $(1)/autoexec.bat
$(if $(filter 40,$(2)),$(call mb_autoexec_append_echo,$(1),Enabled mode $(2).),$(call mb_autoexec_append_echo,$(1),Enabled mode 80.)) $(if $(filter 40,$(2)),$(call mb_autoexec_append_cmd,$(1),mode 40),$(call mb_autoexec_append_cmd,$(1),mode 80))
$(if $(filter 40,$(2)),$(call mb_autoexec_append_echo,$(1),Enabled mode 40.),$(call mb_autoexec_append_echo,$(1),Enabled mode 80.))
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_exec $(MB_AUTOEXEC_STARTUP_EXITCODE)) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_exec $(MB_AUTOEXEC_STARTUP_EXITCODE))
$(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 4 000 > NUL) $(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 4 000)
$(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 15 777 > NUL) $(call mb_autoexec_append_cmd,$(1),omsxctl setcolor 15 777)
$(if $(filter true,$(MB_AUTOEXEC_VERSION)),$(call mb_autoexec_append_cmd,$(1),ver)) $(if $(filter true,$(MB_AUTOEXEC_VERSION)),$(call mb_autoexec_append_cmd,$(1),ver))
$(if $(filter true,$(MB_AUTOEXEC_BYSELF)),$(call mb_autoexec_append_echo,$(1),$(MB_AUTOEXEC_BYSELF_MSG) $(notdir $(1)))) $(if $(filter true,$(MB_AUTOEXEC_BYSELF)),$(call mb_autoexec_append_echo,$(1),$(MB_AUTOEXEC_BYSELF_MSG) $(notdir $(1))))
endef endef
define mb_autoexec_open_gui define _mb_autoexec_open_gui
@echo === Generating autoexec.bat for command with gui $(call mb_autoexec_write_default,$(1),$(2))
$(call mb_autoexec_write_default,$(1))
$(call mb_autoexec_append_stop_fail,$(1)) $(call mb_autoexec_append_stop_fail,$(1))
$(call mb_autoexec_append_gui_mode,$(1)) $(call mb_autoexec_append_gui_mode,$(1))
$(call mb_autoexec_append_echo,$(1),Type shutdown to stop emulation.) $(call mb_autoexec_append_echo,$(1),Type shutdown to stop emulation.)
$(if $(3),$(call mb_autoexec_append_echo,$(1),Running command '$(3)'))
$(if $(3),$(call mb_autoexec_append_cmd,$(1),$(3)))
endef endef
define mb_autoexec_open_gui_cmd define mb_autoexec_open_gui40
$(call mb_autoexec_open_gui,$(1)) $(call _mb_autoexec_open_gui,$(1),40)
$(call mb_autoexec_append_echo,$(1),Running command '$(2)')
$(call mb_autoexec_append_cmd,$(1),$(2))
endef endef
define mb_autoexec_cmd define mb_autoexec_open_gui40_cmd
@echo === Generating autoexec.bat for command $(call _mb_autoexec_open_gui,$(1),40,$(2))
$(call mb_autoexec_write_default,$(1)) endef
define mb_autoexec_open_gui80
$(call _mb_autoexec_open_gui,$(1),80)
endef
define mb_autoexec_open_gui80_cmd
$(call _mb_autoexec_open_gui,$(1),80,$(2))
endef
define mb_autoexec_safe_cmd
$(call mb_autoexec_write_default,$(1),$(3))
$(call mb_autoexec_append_safe_cmd,$(1),$(2)) $(call mb_autoexec_append_safe_cmd,$(1),$(2))
$(call mb_autoexec_append_exit,$(1)) $(call mb_autoexec_append_exit,$(1))
endef endef
define mb_autoexec_cmd_test define mb_autoexec_safe_test
@echo === Generating autoexec.bat for command test $(call mb_autoexec_write_default,$(1),$(3))
$(call mb_autoexec_write_default,$(1))
$(call mb_autoexec_append_safe_test,$(1),$(2)) $(call mb_autoexec_append_safe_test,$(1),$(2))
$(call mb_autoexec_append_exit,$(1)) $(call mb_autoexec_append_exit,$(1))
endef endef

1
lib/make/mb_msxrom.mk
View file

@ -1,4 +1,5 @@
# TODO: Convert pi MSX number data, the named pie slices to hyperdrive storage for distribution over red sea
MB_MSXROM_API ?= https://msxrom.distributedrebirth.love/calc-pi/v19.1 MB_MSXROM_API ?= https://msxrom.distributedrebirth.love/calc-pi/v19.1
MB_MSXROM_CACHE ?= $(MB_CACHE)/msxbuild/msxrom MB_MSXROM_CACHE ?= $(MB_CACHE)/msxbuild/msxrom

9
lib/make/mb_openmsx.mk
View file

@ -1,7 +1,7 @@
MB_OPENMSX_PATH_BIN ?= bin MB_OPENMSX_PATH_BIN ?= bin
MB_OPENMSX_BOOT_TIMEOUT ?= 25 MB_OPENMSX_BOOT_TIMEOUT ?= 25
MB_OPENMSX_MACHINE_DEF ?= Philips_NMS_8250 MB_OPENMSX_MACHINE ?= Philips_NMS_8250
MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333) MB_OPENMSX_SPEED ?= $(if $(findstring turboR,$(MB_OPENMSX_MACHINE)),100,333)
MB_OPENMSX_EXTS ?= MB_OPENMSX_EXTS ?=
MB_OPENMSX_EXTRA_SLOT ?= -ext slotexpander MB_OPENMSX_EXTRA_SLOT ?= -ext slotexpander
@ -34,7 +34,7 @@ define mb_openmsx_setup
endef endef
define _mb_openmsx_run define _mb_openmsx_run
@echo === Running openMSX @echo === openMSX Start for $(notdir $(1))
FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \ FAIL_AFTER_BOOT=$(MB_OPENMSX_BOOT_TIMEOUT) \
FAIL_AFTER_PATH=$(MB_OPENMSX_PATH_BIN) \ FAIL_AFTER_PATH=$(MB_OPENMSX_PATH_BIN) \
BOOT_HDD_PATH="$(1)" \ BOOT_HDD_PATH="$(1)" \
@ -54,10 +54,11 @@ define _mb_openmsx_run
$(MB_OPENMSX_EXTRA_MEM) \ $(MB_OPENMSX_EXTRA_MEM) \
$(MB_OPENMSX_EXTS) \ $(MB_OPENMSX_EXTS) \
-control stdio < $(1)-omsx/stdio.xml -control stdio < $(1)-omsx/stdio.xml
@echo === openMSX Done for $(notdir $(1))
endef endef
define mb_openmsx_dosctl define mb_openmsx_dosctl
$(call mb_openmsx_setup,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE_DEF))) $(if $(wildcard $(1)-omsx),,$(call mb_openmsx_setup,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE))))
$(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1))) $(if $(wildcard $(1)/omsxctl.com),,$(call mb_copy,$(MB_OPENMSX_CTLCACHE)/omsxctl.com,$(1)))
$(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE_DEF))) $(call _mb_openmsx_run,$(1),$(if $(2),$(2),$(MB_OPENMSX_MACHINE)))
endef endef

10
test/ahello-m80/0module.mk
View file

@ -12,25 +12,25 @@ $(TEST_AHELLO_M80)/%.mac: test/ahello-m80/%.mac | $(TEST_AHELLO_M80)
$(call mb_unix2dos,$<,$@) $(call mb_unix2dos,$<,$@)
$(TEST_AHELLO_M80)/ahello.rel: $(TEST_AHELLO_M80)/ahello.mac $(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)) $(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
$(TEST_AHELLO_M80)/ahello.hex: $(TEST_AHELLO_M80)/ahello.rel $(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)) $(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
$(TEST_AHELLO_M80)/ahello.com: $(TEST_AHELLO_M80)/ahello.hex $(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)) $(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
.PHONY: test-ahello-m80-run .PHONY: test-ahello-m80-run
test-ahello-m80-run: $(TEST_AHELLO_M80)/ahello.com 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)) $(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
.PHONY: test-ahello-m80-assert .PHONY: test-ahello-m80-assert
test-ahello-m80-assert: $(TEST_AHELLO_M80)/ahello.com test-ahello-m80-assert: $(TEST_AHELLO_M80)/ahello.com
$(call mb_delete,$(TEST_AHELLO_M80)/ahello.out) $(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)) $(call mb_openmsx_dosctl,$(TEST_AHELLO_M80))
grep "M80: Hello world..." $(TEST_AHELLO_M80)/ahello.out grep "M80: Hello world..." $(TEST_AHELLO_M80)/ahello.out

4
test/ahello-sdcc/0module.mk
View file

@ -18,12 +18,12 @@ $(TEST_AHELLO_SDCC)/ahello.com: $(TEST_AHELLO_SDCC)/ahello.hex
.PHONY: test-ahello-sdcc-run .PHONY: test-ahello-sdcc-run
test-ahello-sdcc-run: $(TEST_AHELLO_SDCC)/ahello.com 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)) $(call mb_openmsx_dosctl,$(TEST_AHELLO_SDCC))
.PHONY: test-ahello-sdcc-assert .PHONY: test-ahello-sdcc-assert
test-ahello-sdcc-assert: $(TEST_AHELLO_SDCC)/ahello.com test-ahello-sdcc-assert: $(TEST_AHELLO_SDCC)/ahello.com
$(call mb_delete,$(TEST_AHELLO_SDCC)/ahello.out) $(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)) $(call mb_openmsx_dosctl,$(TEST_AHELLO_SDCC))
grep "SDCC: Hello world..." $(TEST_AHELLO_SDCC)/ahello.out grep "SDCC: Hello world..." $(TEST_AHELLO_SDCC)/ahello.out

2
test/dist-qa-dos1/0module.mk
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 .PHONY: test-dist-qa-dos1-run
test-dist-qa-dos1-run: | $(TEST_DIST_QA_DOS1_DEPS) 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)) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_DOS1))
.PHONY: test-dist-qa-dos1-assert .PHONY: test-dist-qa-dos1-assert

2
test/dist-qa-dos2/0module.mk
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 .PHONY: test-dist-qa-dos2-run
test-dist-qa-dos2-run: | $(TEST_DIST_QA_DOS2_DEPS) 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)) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_DOS2))
.PHONY: test-dist-qa-dos2-assert .PHONY: test-dist-qa-dos2-assert

4
test/dist-qa-msx1/0module.mk
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 .PHONY: test-dist-qa-msx1-run
test-dist-qa-msx1-run: | $(TEST_DIST_QA_MSX1_DEPS) test-dist-qa-msx1-run: | $(TEST_DIST_QA_MSX1_DEPS)
$(call mb_autoexec_write_default,$(TEST_DIST_QA_MSX1),40) $(call mb_autoexec_open_gui40,$(TEST_DIST_QA_MSX1))
$(call mb_autoexec_append_stop_fail,$(TEST_DIST_QA_MSX1))
$(call mb_autoexec_append_gui_mode,$(TEST_DIST_QA_MSX1))
$(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSX1),$(TEST_DIST_QA_MSX1_MACHINE)) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSX1),$(TEST_DIST_QA_MSX1_MACHINE))
.PHONY: test-dist-qa-msx1-assert .PHONY: test-dist-qa-msx1-assert