From 6bc54cb6288ad56826133be1ff7045a0b7c2790a Mon Sep 17 00:00:00 2001 From: Willem Date: Sat, 29 Jun 2024 23:42:02 +0200 Subject: [PATCH] Added test for file listing in utils. --- test/0module.mk | 2 +- test/dist-qa-msxhub/0module.mk | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/test/0module.mk b/test/0module.mk index 927d73b..69b6334 100644 --- a/test/0module.mk +++ b/test/0module.mk @@ -10,7 +10,7 @@ test-dist-qa-msxhub-assert .PHONY: assert-all assert-all: | $(BUILD_TEST) - @echo All assertions completed. + @echo === All assertions completed. .PHONY: assert-all-video assert-all-video: | assert-all diff --git a/test/dist-qa-msxhub/0module.mk b/test/dist-qa-msxhub/0module.mk index 62d1f3e..5504e28 100644 --- a/test/dist-qa-msxhub/0module.mk +++ b/test/dist-qa-msxhub/0module.mk @@ -34,19 +34,22 @@ $(TEST_DIST_QA_MSXHUB)/%: bin/test/dist/% | $(TEST_DIST_QA_MSXHUB) $(TEST_DIST_D .PHONY: test-dist-qa-msxhub-run test-dist-qa-msxhub-run: | $(TEST_DIST_QA_MSXHUB_DEPS) - $(call mb_autoexec_show_gui80,$(TEST_DIST_QA_MSXHUB),dir/w utils) + $(call mb_autoexec_show_gui80,$(TEST_DIST_QA_MSXHUB),dir/w) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSXHUB),$(TEST_DIST_QA_MSXHUB_MACHINE)) .PHONY: test-dist-qa-msxhub-assert test-dist-qa-msxhub-assert: | $(TEST_DIST_QA_MSXHUB_DEPS) $(call mb_delete,$(TEST_DIST_QA_MSXHUB)/ahello1.out) $(call mb_delete,$(TEST_DIST_QA_MSXHUB)/ahello2.out) + $(call mb_delete,$(TEST_DIST_QA_MSXHUB)/utils.out) $(call mb_autoexec_write_default,$(TEST_DIST_QA_MSXHUB),80) $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello1 > ahello1.out) $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),ahello2 > ahello2.out) - $(call mb_autoexec_append_cmd,$(TEST_DIST_QA_MSXHUB),dir) - $(call mb_autoexec_append_cmd,$(TEST_DIST_QA_MSXHUB),dir/w utils) + $(call mb_autoexec_append_safe_test,$(TEST_DIST_QA_MSXHUB),dir utils > utils.out) + $(call mb_autoexec_append_cmd,$(TEST_DIST_QA_MSXHUB),dir/w) $(call mb_autoexec_append_exit,$(TEST_DIST_QA_MSXHUB)) $(call mb_openmsx_dosctl,$(TEST_DIST_QA_MSXHUB),$(TEST_DIST_QA_MSXHUB_MACHINE)) grep "M80: Hello world..." $(TEST_DIST_QA_MSXHUB)/ahello1.out grep "SDCC: Hello world..." $(TEST_DIST_QA_MSXHUB)/ahello2.out + grep "KONPASS COM" $(TEST_DIST_QA_MSXHUB)/utils.out + grep "MAKE COM" $(TEST_DIST_QA_MSXHUB)/utils.out