From 4b1d4e1d2082dcfd912bc0839a74de9a818c2dd7 Mon Sep 17 00:00:00 2001 From: Willem Date: Tue, 6 Jul 2021 04:28:45 +0200 Subject: [PATCH] Added assert-all build target. --- README.md | 5 +++-- lib/make/mb_base.mk | 2 +- lib/make/mb_msxhub.mk | 6 ++---- lib/make/mb_openmsx.mk | 16 ++++++++++++---- test/0module.mk | 9 +++++++++ test/ahello-m80/0module.mk | 11 +++++------ 6 files changed, 32 insertions(+), 17 deletions(-) create mode 100644 test/0module.mk diff --git a/README.md b/README.md index 08a6787..e3d8dbd 100644 --- a/README.md +++ b/README.md @@ -52,9 +52,10 @@ Current set is WIP. * mb_hex2com * mb_hex2dat * mb_openmsx_dos2 +* mb_openmsx_macro80 * mb_msxhub_file -* mb_msxhub_get_dos2_sys -* mb_msxhub_get_dos2_com +* mb_msxhub_get_dos2 +* mb_msxhub_get_macro80 * mb_assert_file_equals = note: text file only * mb_autoexec_append_cmd * mb_autoexec_append_echo diff --git a/lib/make/mb_base.mk b/lib/make/mb_base.mk index 4575c8a..17a3a90 100644 --- a/lib/make/mb_base.mk +++ b/lib/make/mb_base.mk @@ -21,7 +21,7 @@ endif # Remove space after separator MB_PSEP = $(strip $(MB_SEP)) -# Needed for comma in call arguments (like for l80.com) +# Needed for comma in call arguments (like for l80.com) MB_COMMA:=, define mb_clean diff --git a/lib/make/mb_msxhub.mk b/lib/make/mb_msxhub.mk index e8e678b..a0a2f3c 100644 --- a/lib/make/mb_msxhub.mk +++ b/lib/make/mb_msxhub.mk @@ -16,13 +16,11 @@ endef define mb_msxhub_file $(if $(wildcard $(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(2))),,$(call _mb_msxhub_fetch_file,$(2))) - $(call mb_copy,$(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(2)),$(dir $(1))$(call _mb_lowercase,$(notdir $(1)))) + $(if $(wildcard $(dir $(1))$(call _mb_lowercase,$(notdir $(1)))),,$(call mb_copy,$(MB_MSXHUB_CACHE)/$(subst $(MB_MSXHUB_API)/,,$(2)),$(dir $(1))$(call _mb_lowercase,$(notdir $(1))))) endef -define mb_msxhub_get_dos2_sys +define mb_msxhub_get_dos2 $(call mb_msxhub_file,$(1)/MSXDOS2.SYS,$(MB_MSXHUB_API)/MSXDOS2/2.20-1/get/MSXDOS2/MSXDOS2.SYS) -endef -define mb_msxhub_get_dos2_com $(call mb_msxhub_file,$(1)/COMMAND2.COM,$(MB_MSXHUB_API)/MSXDOS2/2.20-1/get/MSXDOS2/COMMAND2.COM) endef diff --git a/lib/make/mb_openmsx.mk b/lib/make/mb_openmsx.mk index 36416a5..4427f30 100644 --- a/lib/make/mb_openmsx.mk +++ b/lib/make/mb_openmsx.mk @@ -33,17 +33,25 @@ define _mb_openmsx_run JOYPORTB=$(MB_OPENMSX_JOYPORTB) \ $(MB_OPENMSX_CMD) endef + define _mb_openmsx_run_dos $(call mb_msxhub_file,$(1)/omsxctl.com,$(MB_MSXHUB_API)/OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.com) $(call _mb_openmsx_run,$(1)) endef + # TODO: add msx1+allversions of dos to https://github.com/fr3nd/msxhub-packages/issues/18 #define mb_openmsx_dos1 -# cp build/msxdos1/* $(1) +# $(call mb_msxhub_get_dos1,$(1)) # $(call _mb_openmsx_run_dos,$(1)) #endef + define mb_openmsx_dos2 - $(call mb_msxhub_get_dos2_sys,$(1)) - $(call mb_msxhub_get_dos2_com,$(1)) - $(call _mb_openmsx_run_dos, $(1)) + $(call mb_msxhub_get_dos2,$(1)) + $(call _mb_openmsx_run_dos,$(1)) endef + +define mb_openmsx_macro80 + $(call mb_msxhub_get_macro80,$(1)) + $(call mb_openmsx_dos2,$(1)) +endef + diff --git a/test/0module.mk b/test/0module.mk new file mode 100644 index 0000000..70a85d4 --- /dev/null +++ b/test/0module.mk @@ -0,0 +1,9 @@ + +BUILD_HELP += \\n\\t* assert-all \(Run all asertion tests\) +BUILD_TEST := \ +test-ahello-m80-assert \ +test-ahello-sdcc-assert + +.PHONY: assert-all +assert-all: $(BUILD_TEST) + @echo All assertions completed. diff --git a/test/ahello-m80/0module.mk b/test/ahello-m80/0module.mk index 2d3518b..e450ac1 100644 --- a/test/ahello-m80/0module.mk +++ b/test/ahello-m80/0module.mk @@ -1,21 +1,20 @@ -TEST_AHELLO_M80 := $(PATH_BIN)/test/ahello-m80 +TEST_AHELLO_M80 := $(PATH_BIN)/test/ahello-m80 BUILD_HELP += \\n\\t* $(TEST_AHELLO_M80)/ahello.com\\n\\t* test-ahello-m80-run\\n\\t* test-ahello-m80-assert $(TEST_AHELLO_M80): $(call mb_mkdir,$(TEST_AHELLO_M80)) - $(call mb_msxhub_get_macro80,$(TEST_AHELLO_M80)) $(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_openmsx_dos2,$(TEST_AHELLO_M80)) + $(call mb_openmsx_macro80,$(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_openmsx_dos2,$(TEST_AHELLO_M80)) + $(call mb_openmsx_macro80,$(TEST_AHELLO_M80)) $(TEST_AHELLO_M80)/ahello.com: $(TEST_AHELLO_M80)/ahello.hex $(call mb_hex2com,$(TEST_AHELLO_M80)/ahello.hex,$(TEST_AHELLO_M80)/ahello.com) @@ -23,11 +22,11 @@ $(TEST_AHELLO_M80)/ahello.com: $(TEST_AHELLO_M80)/ahello.hex .PHONY: test-ahello-m80-run test-ahello-m80-run: $(TEST_AHELLO_M80)/ahello.com $(call mb_autoexec_open_gui,$(TEST_AHELLO_M80)) - $(call mb_openmsx_dos2,$(TEST_AHELLO_M80)) + $(call mb_openmsx_macro80,$(TEST_AHELLO_M80)) .PHONY: test-ahello-m80-assert test-ahello-m80-assert: $(TEST_AHELLO_M80)/ahello.com $(call mb_delete,$(TEST_AHELLO_M80)/test.out) $(call mb_autoexec_cmd_test,$(TEST_AHELLO_M80),ahello > test.out) - $(call mb_openmsx_dos2,$(TEST_AHELLO_M80)) + $(call mb_openmsx_macro80,$(TEST_AHELLO_M80)) grep "M80: Hello world..." $(TEST_AHELLO_M80)/test.out