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

Added dist proces dep and allignment of text.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -2s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-07-07 14:48:12 +02:00
parent e7f1b75a1f
commit d8319f15f7
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/make/mb_assert.mk
View file

@ -3,7 +3,7 @@
define mb_assert_flow_grep_binary define mb_assert_flow_grep_binary
$(1)/@assert-$(2): $(1)/@build $(1)/@assert-$(2): $(1)/@build
grep -q -U $(4) $(1)/$(3) grep -q -U $(4) $(1)/$(3)
$$(call mb_make_call,mb_make_echo_assert,Assert succes @assert-$(2)) $$(call mb_make_call,mb_make_echo_assert,Assert succesfully @assert-$(2))
MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)/@assert-$(2),"Asserts that $(3) output matches.") MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)/@assert-$(2),"Asserts that $(3) output matches.")
MB_PROJ_PHASE_TEST_DEPS += $(1)/@assert-$(2) MB_PROJ_PHASE_TEST_DEPS += $(1)/@assert-$(2)
.PHONY: $(1)/@assert-$(2) .PHONY: $(1)/@assert-$(2)
@ -17,7 +17,7 @@ $(1)-test-$(2)/@assert: $(1)/@build
$$(call mb_copy,$(1)/$(3).com,$(1)-test-$(2)) $$(call mb_copy,$(1)/$(3).com,$(1)-test-$(2))
$$(call mb_msxpipe_safe_test,$(1)-test-$(2),$(3) > $(3).out) $$(call mb_msxpipe_safe_test,$(1)-test-$(2),$(3) > $(3).out)
grep -q $(4) $(1)-test-$(2)/$(3).out grep -q $(4) $(1)-test-$(2)/$(3).out
$$(call mb_make_call,mb_make_echo_assert,Assert succes $(1)-test-$(2)/@assert) $$(call mb_make_call,mb_make_echo_assert,Assert succesfully $(1)-test-$(2)/@assert)
MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)-test-$(2)/@assert,"Asserts that $(3) output matches.") MB_DOC_FIRE_TARGET += $$(call mb_doc_target,$(1)-test-$(2)/@assert,"Asserts that $(3) output matches.")
MB_PROJ_PHASE_TEST_DEPS += $(1)-test-$(2)/@assert MB_PROJ_PHASE_TEST_DEPS += $(1)-test-$(2)/@assert
.PHONY: $(1)-test-$(2)/@assert .PHONY: $(1)-test-$(2)/@assert

2
src/dist-qa-dos1/0module.mk
View file

@ -26,7 +26,7 @@ $(DIST_QA_DOS1_BIN)/@assert: | $(DIST_QA_DOS1_DEPS)
$(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2) $(call mb_autoexec_append_safe_test,$(DIST_QA_DOS1_BIN),ahello2)
$(call mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN)) $(call mb_autoexec_append_exit,$(DIST_QA_DOS1_BIN))
$(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN)) $(call mb_openmsx_dosctl,$(DIST_QA_DOS1_BIN))
$(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_DOS1_BIN)/@assert) $(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_DOS1_BIN)/@assert)
MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.") MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_DOS1_BIN)/@assert,"Assert binaries on msxdos1.")
MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_DOS1_BIN)/@assert MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_DOS1_BIN)/@assert
.PHONY: $(DIST_QA_DOS1_BIN)/@assert .PHONY: $(DIST_QA_DOS1_BIN)/@assert

2
src/dist-qa-msx1/0module.mk
View file

@ -31,7 +31,7 @@ $(DIST_QA_MSX1_BIN)/@assert: | $(DIST_QA_MSX1_DEPS)
$(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE)) $(call mb_make_call,mb_openmsx_dosctl,$(DIST_QA_MSX1_BIN),$(DIST_QA_MSX1_MACHINE))
grep -q "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out grep -q "M80: Hello world..." $(DIST_QA_MSX1_BIN)/ahello1.out
grep -q "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out grep -q "SDCC: Hello world..." $(DIST_QA_MSX1_BIN)/ahello2.out
$(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_MSX1_BIN)/@assert) $(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_MSX1_BIN)/@assert)
MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.") MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSX1_BIN)/@assert,"Assert binaries on MSX1 machine.")
MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_MSX1_BIN)/@assert MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_MSX1_BIN)/@assert
.PHONY: $(DIST_QA_MSX1_BIN)/@assert .PHONY: $(DIST_QA_MSX1_BIN)/@assert

2
src/dist-qa-msxhub/0module.mk
View file

@ -57,7 +57,7 @@ $(DIST_QA_MSXHUB_BIN)/@assert: | $(DIST_QA_MSXHUB_DEPS)
grep -q "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out grep -q "SDCC: Hello world..." $(DIST_QA_MSXHUB_BIN)/ahello2.out
grep -q "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out grep -q "KONPASS COM" $(DIST_QA_MSXHUB_BIN)/utils.out
grep -q "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out grep -q "MAKE COM" $(DIST_QA_MSXHUB_BIN)/utils.out
$(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_MSXHUB_BIN)/@assert) $(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_MSXHUB_BIN)/@assert)
MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.") MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_MSXHUB_BIN)/@assert,"Asserts that all dist artifacts execute results.")
MB_PROJ_PHASE_TEST_DEPS += $(DIST_QA_MSXHUB_BIN)/@assert MB_PROJ_PHASE_TEST_DEPS += $(DIST_QA_MSXHUB_BIN)/@assert
.PHONY: $(DIST_QA_MSXHUB_BIN)/@assert .PHONY: $(DIST_QA_MSXHUB_BIN)/@assert

1
src/dist/0module.mk vendored
View file

@ -10,6 +10,7 @@ $(DIST_BIN): | @init
$(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN) $(DIST_BIN)/readme.txt: $(DIST_SRC)/readme.txt | $(DIST_BIN)
$(call mb_conv_unix2dos,$<,$@) $(call mb_conv_unix2dos,$<,$@)
MB_PROJ_PHASE_PROCESS_DEPS += $(DIST_BIN)/readme.txt
$(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN) $(DIST_BIN)/ahello1.com: bin/ahello-m80/ahello.com | $(DIST_BIN)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)