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

Used proper make for qa copy.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in 0s
Details

Browse source
This commit is contained in:
Willem Cazander 2024-06-26 03:21:06 +02:00
parent 5562fe0d7a
commit 54f8016ead
3 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/dist-qa-dos1/0module.mk
View file

@ -1,5 +1,6 @@
TEST_DIST_QA_DOS1 := $(PATH_BIN)/test/dist-qa-dos1 TEST_DIST_QA_DOS1 := $(PATH_BIN)/test/dist-qa-dos1
TEST_DIST_QA_DOS1_DEPS := $(subst dist,dist-qa-dos1,$(TEST_DIST_DEPS))
BUILD_HELP += \\n\\t* test-dist-qa-dos1-run\\n\\t* test-dist-qa-dos1-assert BUILD_HELP += \\n\\t* test-dist-qa-dos1-run\\n\\t* test-dist-qa-dos1-assert
$(TEST_DIST_QA_DOS1): $(TEST_DIST_QA_DOS1):
@ -7,19 +8,16 @@ $(TEST_DIST_QA_DOS1):
$(call mb_package_emuctl,$(TEST_DIST_QA_DOS1)) $(call mb_package_emuctl,$(TEST_DIST_QA_DOS1))
$(call mb_package_dos1,$(TEST_DIST_QA_DOS1)) $(call mb_package_dos1,$(TEST_DIST_QA_DOS1))
$(TEST_DIST_QA_DOS1)/ahello1.com: bin/test/dist/ahello1.com | $(TEST_DIST_QA_DOS1) $(TEST_DIST_QA_DOS1)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS1) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)
$(TEST_DIST_QA_DOS1)/ahello2.com: bin/test/dist/ahello2.com | $(TEST_DIST_QA_DOS1)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
.PHONY: test-dist-qa-dos1-run .PHONY: test-dist-qa-dos1-run
test-dist-qa-dos1-run: | $(TEST_DIST_QA_DOS1)/ahello1.com $(TEST_DIST_QA_DOS1)/ahello2.com test-dist-qa-dos1-run: | $(TEST_DIST_QA_DOS1_DEPS)
$(call mb_autoexec_open_gui,$(TEST_DIST_QA_DOS1)) $(call mb_autoexec_open_gui,$(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
test-dist-qa-dos1-assert: | $(TEST_DIST_QA_DOS1)/ahello1.com $(TEST_DIST_QA_DOS1)/ahello2.com test-dist-qa-dos1-assert: | $(TEST_DIST_QA_DOS1_DEPS)
$(call mb_delete,$(TEST_DIST_QA_DOS1)/test.out) $(call mb_delete,$(TEST_DIST_QA_DOS1)/test.out)
$(call mb_autoexec_write_default,$(TEST_DIST_QA_DOS1)) $(call mb_autoexec_write_default,$(TEST_DIST_QA_DOS1))
$(call mb_autoexec_append_cmd_test,$(TEST_DIST_QA_DOS1),ahello1) $(call mb_autoexec_append_cmd_test,$(TEST_DIST_QA_DOS1),ahello1)

10
test/dist-qa-dos2/0module.mk
View file

@ -1,5 +1,6 @@
TEST_DIST_QA_DOS2 := $(PATH_BIN)/test/dist-qa-dos2 TEST_DIST_QA_DOS2 := $(PATH_BIN)/test/dist-qa-dos2
TEST_DIST_QA_DOS2_DEPS := $(subst dist,dist-qa-dos2,$(TEST_DIST_DEPS))
BUILD_HELP += \\n\\t* test-dist-qa-dos2-run\\n\\t* test-dist-qa-dos2-assert BUILD_HELP += \\n\\t* test-dist-qa-dos2-run\\n\\t* test-dist-qa-dos2-assert
$(TEST_DIST_QA_DOS2): $(TEST_DIST_QA_DOS2):
@ -7,19 +8,16 @@ $(TEST_DIST_QA_DOS2):
$(call mb_package_emuctl,$(TEST_DIST_QA_DOS2)) $(call mb_package_emuctl,$(TEST_DIST_QA_DOS2))
$(call mb_package_dos2,$(TEST_DIST_QA_DOS2)) $(call mb_package_dos2,$(TEST_DIST_QA_DOS2))
$(TEST_DIST_QA_DOS2)/ahello1.com: bin/test/dist/ahello1.com | $(TEST_DIST_QA_DOS2) $(TEST_DIST_QA_DOS2)/%: bin/test/dist/% | $(TEST_DIST_QA_DOS2) $(TEST_DIST_DEPS)
$(call mb_copy,$<,$@)
$(TEST_DIST_QA_DOS2)/ahello2.com: bin/test/dist/ahello2.com | $(TEST_DIST_QA_DOS2)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
.PHONY: test-dist-qa-dos2-run .PHONY: test-dist-qa-dos2-run
test-dist-qa-dos2-run: | $(TEST_DIST_QA_DOS2)/ahello1.com $(TEST_DIST_QA_DOS2)/ahello2.com test-dist-qa-dos2-run: | $(TEST_DIST_QA_DOS2_DEPS)
$(call mb_autoexec_open_gui,$(TEST_DIST_QA_DOS2)) $(call mb_autoexec_open_gui,$(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
test-dist-qa-dos2-assert: | $(TEST_DIST_QA_DOS2)/ahello1.com $(TEST_DIST_QA_DOS2)/ahello2.com test-dist-qa-dos2-assert: | $(TEST_DIST_QA_DOS2_DEPS)
$(call mb_delete,$(TEST_DIST_QA_DOS2)/test.out) $(call mb_delete,$(TEST_DIST_QA_DOS2)/test.out)
$(call mb_autoexec_write_default,$(TEST_DIST_QA_DOS2)) $(call mb_autoexec_write_default,$(TEST_DIST_QA_DOS2))
$(call mb_autoexec_append_cmd_test,$(TEST_DIST_QA_DOS2),ahello1 > ahello1.out) $(call mb_autoexec_append_cmd_test,$(TEST_DIST_QA_DOS2),ahello1 > ahello1.out)

14
test/dist/0module.mk vendored
View file

@ -3,14 +3,14 @@ TEST_DIST_NAME := dist
TEST_DIST_SRC := test/$(TEST_DIST_NAME) TEST_DIST_SRC := test/$(TEST_DIST_NAME)
TEST_DIST_BIN := $(PATH_BIN)/test/$(TEST_DIST_NAME) TEST_DIST_BIN := $(PATH_BIN)/test/$(TEST_DIST_NAME)
TEST_DIST_OUT := $(PATH_BIN)/test/$(TEST_DIST_NAME).tar.gz TEST_DIST_OUT := $(PATH_BIN)/test/$(TEST_DIST_NAME).tar.gz
TEST_DIST_INC := readme.txt TEST_DIST_DEPS := $(TEST_DIST_BIN)/readme.txt $(TEST_DIST_BIN)/ahello1.com $(TEST_DIST_BIN)/ahello2.com
BUILD_HELP += \\n\\t* $(TEST_DIST_OUT) BUILD_HELP += \\n\\t* $(TEST_DIST_OUT)\\n\\t* test-dist-prepare
$(TEST_DIST_BIN): $(TEST_DIST_BIN):
$(call mb_mkdir,$(TEST_DIST_BIN)) $(call mb_mkdir,$(TEST_DIST_BIN))
$(TEST_DIST_BIN)/readme.txt: $(TEST_DIST_SRC)/readme.txt | $(TEST_DIST_BIN) $(TEST_DIST_BIN)/readme.txt: $(TEST_DIST_SRC)/readme.txt | $(TEST_DIST_BIN)
$(call mb_copy,$<,$@) $(call mb_unix2dos,$<,$@)
$(TEST_DIST_BIN)/ahello1.com: bin/test/ahello-m80/ahello.com | $(TEST_DIST_BIN) $(TEST_DIST_BIN)/ahello1.com: bin/test/ahello-m80/ahello.com | $(TEST_DIST_BIN)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
@ -18,8 +18,8 @@ $(TEST_DIST_BIN)/ahello1.com: bin/test/ahello-m80/ahello.com | $(TEST_DIST_BIN)
$(TEST_DIST_BIN)/ahello2.com: bin/test/ahello-sdcc/ahello.com | $(TEST_DIST_BIN) $(TEST_DIST_BIN)/ahello2.com: bin/test/ahello-sdcc/ahello.com | $(TEST_DIST_BIN)
$(call mb_copy,$<,$@) $(call mb_copy,$<,$@)
$(TEST_DIST_OUT): \ .PHONY: test-dist-prepare
$(TEST_DIST_BIN)/readme.txt \ test-dist-prepare: | $(TEST_DIST_DEPS)
$(TEST_DIST_BIN)/ahello1.com \
$(TEST_DIST_BIN)/ahello2.com $(TEST_DIST_OUT): | test-dist-prepare
$(call mb_create_dist,$(TEST_DIST_OUT),$(TEST_DIST_BIN)) $(call mb_create_dist,$(TEST_DIST_OUT),$(TEST_DIST_BIN))