Moved matrix test to package-qa and added option to test on few
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 4s

machines.
This commit is contained in:
Willem Cazander 2024-07-19 00:14:09 +02:00
parent 33127af5db
commit 6eebd2df94
2 changed files with 14 additions and 11 deletions

View file

@ -54,7 +54,7 @@ $(MB_   )$(eval $(call mb-make-call,mb-flow-clone-deps-proj-setup
$(MB_   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@test,$(7),$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_test/$(notdir $(1))/$(3))))) $(MB_   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@test,$(7),$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_test/$(notdir $(1))/$(3)))))
endef endef
$(call mb-make-call,mb-doc-function-flow,mb-flow-assert-msxpipe-grep-test,Inject flow of single grep assert.,<build-dir> <deps> <test-id> <cmd-name> <grep-match> [packages] [machine]) $(call mb-make-call,mb-doc-function-flow,mb-flow-assert-msxpipe-grep-test,Inject flow of single grep assert.,<build-dir> <deps> <test-id> <cmd-name> <grep-match> [packages] [machine])
define mb_flow-assert-msxpipe-grep-package-qa define mb-flow-assert-msxpipe-grep-package-qa
$(MB_   )$(call mb-make-call,mb-make-check-arg5,$(0),$(1),$(2),$(3),$(4),$(5)) $(MB_   )$(call mb-make-call,mb-make-check-arg5,$(0),$(1),$(2),$(3),$(4),$(5))
$(MB_   )$(eval $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_package_qa/$(notdir $(1))/$(3))),$(1),$(2),$(6),$(7))) $(MB_   )$(eval $(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_package_qa/$(notdir $(1))/$(3))),$(1),$(2),$(6),$(7)))
$(MB_   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@package-qa,$(7),$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_package_qa/$(notdir $(1))/$(3))))) $(MB_   )$(eval $(call mb-make-call,__mb-flow-assert-msxpipe-grep-x,$(1),$(3),$(4),$(5),@package-qa,$(7),$(subst $(abspath $(dir $(1)))/,,$(dir $(1))$(abspath $(1)$(MB_@WORK)_assert_package_qa/$(notdir $(1))/$(3)))))

View file

@ -6,18 +6,21 @@ ASSERT_MSXROM_DEPS := $(call mb-make-call,mb-make-module-local-deps,$(PATH_BIN),
ASSERT_MSXROM_MATRIX ?= off ASSERT_MSXROM_MATRIX ?= off
$(call mb-make-call,mb-doc-variable,ASSERT_MSXROM_MATRIX,When on enabled matrix testing of all machines.) $(call mb-make-call,mb-doc-variable,ASSERT_MSXROM_MATRIX,When on enabled matrix testing of all machines.)
ASSERT_MSXROM_MACHINES ?=
$(call mb-make-call,mb-doc-variable,ASSERT_MSXROM_MACHINES,When set only test this list of machines else all supported.)
# Test matrix <all-machines> <dos2,nextor> <hello1,hello2,hello3,hello4> = 13 * 2 * 4 = 104 assertion tests
# Package QA matrix on: <all-machines> <dos2,nextor> <hello1,hello2,hello3,hello4> = 13 * 2 * 4 = 104 assertion tests
ifeq ("$(ASSERT_MSXROM_MATRIX)", "on") ifeq ("$(ASSERT_MSXROM_MATRIX)", "on")
$(MB_   )$(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(ASSERT_MSXROM_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS)) $(MB_   )$(call mb-make-call,mb-flow-clone-deps-proj-setup-orphan,$(ASSERT_MSXROM_BIN),$(EXAMPLE_DIST_HELLO_BIN),$(EXAMPLE_DIST_HELLO_DEPS))
$(MB_   )$(foreach _rom,$(MB_MSXROM_FIRE_MACHINES),$\ $(MB_   )$(foreach _rom,$(if $(ASSERT_MSXROM_MACHINES),$(ASSERT_MSXROM_MACHINES),$(MB_MSXROM_FIRE_MACHINES)),$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk1,hello1,M80,msxdos2-boot,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk1,hello1,M80,msxdos2-boot,$(_rom))$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk2,hello2,SDCC,msxdos2-boot,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk2,hello2,SDCC,msxdos2-boot,$(_rom))$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk3,hello3,MAKE,msxdos2-boot,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos2-chk3,hello3,MAKE,msxdos2-boot,$(_rom))$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos1-chk4,hello4,N80,msxdos2-boot,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-msxdos1-chk4,hello4,N80,msxdos2-boot,$(_rom))$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk1,hello1,M80,,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk1,hello1,M80,,$(_rom))$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk2,hello2,SDCC,,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk2,hello2,SDCC,,$(_rom))$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk3,hello3,MAKE,,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk3,hello3,MAKE,,$(_rom))$\
$(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-test,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk4,hello4,N80,,$(_rom))$\ $(MB_      )$(call mb-make-call,mb-flow-assert-msxpipe-grep-package-qa,$(ASSERT_MSXROM_BIN),$(ASSERT_MSXROM_DEPS),$(_rom)-nextor-chk4,hello4,N80,,$(_rom))$\
$(MB_   )) $(MB_   ))
endif endif