Renamed to remove unix naming from silent openMSX hack.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -1s

This commit is contained in:
Willem Cazander 2024-07-07 15:02:36 +02:00
parent ffd7d845ff
commit 4523aa26eb
4 changed files with 14 additions and 8 deletions

View file

@ -6,7 +6,8 @@ on:
pull_request:
env:
VERBOSE: off
MB_OPENMSX_STDOUT_NULL: on
MB_OPENMSX_STDOUT_IGNORE: on
MB_OPENMSX_STDERR_IGNORE: on
MB_AUTOEXEC_STARTUP_NOTE: ${{github.workflow}}
MB_AUTOEXEC_EMBED_USER: GITHUB_ACTOR
MB_AUTOEXEC_EMBED_VARS: GITHUB_EVENT_NAME GITHUB_REF_NAME GITHUB_REF_TYPE GITHUB_REPOSITORY GITHUB_REPOSITORY_OWNER

View file

@ -37,8 +37,8 @@ MB_OPENMSX_LOG_PREFIX ?= "Start openMSX! for "
MB_DOC_FIRE_VARIABLE_DEEP += $(call mb_make_call,mb_doc_variable_deep,MB_OPENMSX_LOG_PREFIX,"Prefix of startup message of openMSX.")
# Kills valuable info on build server, thus keep off until issues openMSX are solved, rm this variale ASP;
MB_OPENMSX_STDOUT_NULL ?= off
#MB_DOC_FIRE_VARIABLE_DEEP += $(call mb_make_call,mb_doc_variable_deep,MB_OPENMSX_STDOUT_NULL,"Pipes openMSX stdout to null for silence messages.")
MB_OPENMSX_STDOUT_IGNORE ?= off
MB_OPENMSX_STDERR_IGNORE ?= off
define mb_openmsx_setup
@ -90,7 +90,9 @@ define _mb_openmsx_run
$(if $(filter ram4mb,$(3)),-ext ram2mb) \
$(if $(filter ram4mb,$(3)),-ext ram4mb) \
$(MB_OPENMSX_ARGS) \
-control stdio < $(1)-omsx/stdio.xml $(if $(filter on,$(MB_OPENMSX_STDOUT_NULL)),$(MB_OS_ERRIGNORE) >/dev/null)
-control stdio < $(1)-omsx/stdio.xml \
$(if $(filter on,$(MB_OPENMSX_STDOUT_IGNORE)),$(MB_OS_STDOUT_IGNORE)) \
$(if $(filter on,$(MB_OPENMSX_STDERR_IGNORE)),$(MB_OS_STDERR_IGNORE))
rsync --checksum --recursive "$(1)-omsx/persistent/fire-hdd/untitled1/sync/" "$(1)/"
endef

View file

@ -6,7 +6,8 @@ ifeq ($(OS),Windows_NT)
MB_OS_MKDIR = mkdir
MB_OS_COPY = copy
MB_OS_ECHO ?= echo
MB_OS_ERRIGNORE = 2>NUL || true
MB_OS_STDOUT_IGNORE = >NUL
MB_OS_STDERR_IGNORE = 2>NUL || true
MB_OS_SEP = "\"
MB_OS_CACHE ?= %LOCALAPPDATA%
MB_OS_COLORS ?= -1
@ -16,7 +17,8 @@ else
MB_OS_MKDIR = mkdir -p
MB_OS_COPY = cp
MB_OS_ECHO ?= /usr/bin/echo
MB_OS_ERRIGNORE = 2>/dev/null
MB_OS_STDOUT_IGNORE = >/dev/null
MB_OS_STDERR_IGNORE = 2>/dev/null
MB_OS_SEP = "/"
MB_OS_CACHE ?= ~/.cache
MB_OS_COLORS ?= $(shell tput colors 2> /dev/null;test $$? -eq 0 || echo "-1")
@ -28,7 +30,8 @@ MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_RMDI
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_MKDIR,"Native OS create folder command.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_COPY,"Native OS copy command.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_ECHO,"Native OS echo command.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_ERRIGNORE,"Native OS error to ignore redirect.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_STDOUT_IGNORE,"Native OS ignore stdout.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_STDERR_IGNORE,"Native OS ignore stderr.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_SEP,"Native OS path seperator.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_CACHE,"Native OS application cache folder.")
MB_DOC_FIRE_VARIABLE_ROCK += $(call mb_make_call,mb_doc_variable_rock,MB_OS_COLORS,"Native OS terminal color count support.")

View file

@ -30,7 +30,7 @@ $(DIST_QA_DOS2_BIN)/@assert: | $(DIST_QA_DOS2_DEPS)
$(call mb_openmsx_dosctl,$(DIST_QA_DOS2_BIN))
grep -q "M80: Hello world..." $(DIST_QA_DOS2_BIN)/ahello1.out
grep -q "SDCC: Hello world..." $(DIST_QA_DOS2_BIN)/ahello2.out
$(call mb_make_call,mb_make_echo_assert,Assert succes $(DIST_QA_DOS2_BIN)/@assert)
$(call mb_make_call,mb_make_echo_assert,Assert succesfully $(DIST_QA_DOS2_BIN)/@assert)
MB_DOC_FIRE_TARGET += $(call mb_make_call,mb_doc_target,$(DIST_QA_DOS2_BIN)/@assert,"Assert binaries on msxdos2.")
MB_PROJ_PHASE_PACKAGE_QA_DEPS += $(DIST_QA_DOS2_BIN)/@assert
.PHONY: $(DIST_QA_DOS2_BIN)/@assert