Merge branch 'master' into test_ci_fail_match
Some checks failed
Run test asserts / Test-Asserts (pull_request) Failing after 5s

This commit is contained in:
Willem Cazander 2024-06-24 01:25:33 +02:00
commit 7c92990a9d
10 changed files with 37 additions and 22 deletions

View file

@ -1,6 +1,10 @@
name: Run test asserts name: Run test asserts
run-name: Test assert-all by ${{github.actor}} run-name: Test assert-all by ${{github.actor}}
on: [push,pull_request] on:
push:
branches:
- master
pull_request:
jobs: jobs:
Test-Asserts: Test-Asserts:
runs-on: self-hosted runs-on: self-hosted

View file

@ -32,10 +32,14 @@ The files in this repro try to handle these steps for you.
* make * make
* openmsx * openmsx
* sdcc * sdcc
* hex2bin * hex2bin-2.5 (see [https://hex2bin.sourceforge.net/](https://hex2bin.sourceforge.net/))
* wget * wget
* unix2dos * unix2dos
For debian use;
apt-get install make openmsx wget dos2unix sdcc
## Usage ## Usage
Include the `lib/make/msxbuild.mk` file from your Makefile. Include the `lib/make/msxbuild.mk` file from your Makefile.

View file

@ -1,3 +0,0 @@
rem Add mouse to openMSX
omsxctl plug joyporta mouse
omsxctl plug

View file

@ -1,2 +1,19 @@
rem Goto normal z80 speed rem Select z80 speed
omsxctl set speed 100 IFF 3 == %1
echo 'Select 3.51 Mhz'
omsxctl set speed 100 > NUL
exit 0
ENDIFF
IFF 7 == %1
echo 'Select 7 Mhz'
omsxctl set speed 200 > NUL
exit 0
ENDIFF
IFF 11 == %1
echo 'Select 11 Mhz'
omsxctl set speed 333 > NUL
exit 0
ENDIFF
echo 'Select openMSX Z80 emulation speed'
echo 'Usage: z80 <3/7/11>'
exit 1

View file

@ -36,7 +36,7 @@ endef
define mb_autoexec_write_default define mb_autoexec_write_default
echo -n "" > $(1)/autoexec.bat echo -n "" > $(1)/autoexec.bat
$(if $(filter true,$(MB_AUTOEXEC_BYSELF)),$(call mb_autoexec_append_rem,$(1),$(MB_AUTOEXEC_BYSELF_MSG))) $(if $(filter true,$(MB_AUTOEXEC_BYSELF)),$(call mb_autoexec_append_rem,$(1),$(MB_AUTOEXEC_BYSELF_MSG)))
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds fail_after_init $(MB_AUTOEXEC_STARTUP_EXITCODE)) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_STARTUP_TIMEOUT) seconds failed_autoexec $(MB_AUTOEXEC_STARTUP_EXITCODE))
$(if $(filter 40,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_cmd,$(1),mode 40)) $(if $(filter 40,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_cmd,$(1),mode 40))
$(if $(filter 40,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_echo,$(1),Enabled mode 40.)) $(if $(filter 40,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_echo,$(1),Enabled mode 40.))
$(if $(filter 80,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_cmd,$(1),mode 80)) $(if $(filter 80,$(MB_AUTOEXEC_TEXTMODE)),$(call mb_autoexec_append_cmd,$(1),mode 80))
@ -60,7 +60,7 @@ endef
define mb_autoexec_cmd define mb_autoexec_cmd
@echo === Generating autoexec.bat for command @echo === Generating autoexec.bat for command
$(call mb_autoexec_write_default,$(1)) $(call mb_autoexec_write_default,$(1))
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_CMD_TIMEOUT) seconds fail_after_cmd $(MB_AUTOEXEC_CMD_EXITCODE)) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_CMD_TIMEOUT) seconds failed_cmd $(MB_AUTOEXEC_CMD_EXITCODE))
$(call mb_autoexec_append_echo,$(1),Running command '$(2)') $(call mb_autoexec_append_echo,$(1),Running command '$(2)')
$(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_cmd,$(1),$(2))
$(call mb_autoexec_append_exit,$(1)) $(call mb_autoexec_append_exit,$(1))
@ -68,7 +68,7 @@ endef
define mb_autoexec_cmd_test define mb_autoexec_cmd_test
@echo === Generating autoexec.bat for command test @echo === Generating autoexec.bat for command test
$(call mb_autoexec_write_default,$(1)) $(call mb_autoexec_write_default,$(1))
$(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_TEST_TIMEOUT) seconds fail_after_test $(MB_AUTOEXEC_TEST_EXITCODE)) $(call mb_autoexec_append_cmd,$(1),omsxctl fail_after $(MB_AUTOEXEC_TEST_TIMEOUT) seconds failed_test $(MB_AUTOEXEC_TEST_EXITCODE))
$(call mb_autoexec_append_echo,$(1),Running test '$(2)') $(call mb_autoexec_append_echo,$(1),Running test '$(2)')
$(call mb_autoexec_append_cmd,$(1),$(2)) $(call mb_autoexec_append_cmd,$(1),$(2))
$(call mb_autoexec_append_exit,$(1)) $(call mb_autoexec_append_exit,$(1))

View file

@ -15,12 +15,6 @@ MB_OPENMSX_ARGS = \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \ -script $(PATH_MSXBUILD_REAL)/lib/openmsx/fail_after.tcl \
-script $(PATH_MSXBUILD_REAL)/lib/openmsx/omsxctl.tcl -script $(PATH_MSXBUILD_REAL)/lib/openmsx/omsxctl.tcl
# TODO: add run flag to disable xml output like "-control stdio-boot-only"
ifeq ($(OS),Windows_NT)
MB_OPENMSX_CMD = $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml
else
MB_OPENMSX_CMD = $(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml | sed -n -e 's/.*>\(.*\)<.*/\1/p' | tail -n+3
endif
define _mb_openmsx_run define _mb_openmsx_run
@echo === Running openMSX @echo === Running openMSX
$(call mb_msxhub_file,$(PATH_MSXBUILD_REAL)/lib/openmsx,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl) $(call mb_msxhub_file,$(PATH_MSXBUILD_REAL)/lib/openmsx,OMSXCTL/1.0-1/get/OMSXCTL/omsxctl.tcl)
@ -32,7 +26,9 @@ define _mb_openmsx_run
JOYPORTB=$(MB_OPENMSX_JOYPORTB) \ JOYPORTB=$(MB_OPENMSX_JOYPORTB) \
SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \ SCALE_FACTOR=$(MB_OPENMSX_SCALE_FACTOR) \
SPEED=$(MB_OPENMSX_SPEED) \ SPEED=$(MB_OPENMSX_SPEED) \
$(MB_OPENMSX_CMD) SAVE_SETTINGS_ON_EXIT=off \
THROTTLE=off \
$(PATH_OPENMSX)/openmsx $(MB_OPENMSX_ARGS) -control stdio < $(PATH_MSXBUILD_REAL)/lib/openmsx/boot_stdio.xml
endef endef
define mb_openmsx_dosctl define mb_openmsx_dosctl

View file

@ -1,6 +1,5 @@
# MSXHUB fetch package files functions # MSXHUB fetch package files functions
define mb_package_emuctl define mb_package_emuctl
$(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/mouse.bat,$(1))
$(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/shutdown.bat,$(1)) $(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/shutdown.bat,$(1))
$(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/z80.bat,$(1)) $(call mb_copy,$(PATH_MSXBUILD)/lib/emuctl/z80.bat,$(1))
endef endef

View file

@ -3,7 +3,7 @@
# Typically used in automation tools which run openMSX without human interaction. # Typically used in automation tools which run openMSX without human interaction.
# Supported environment variables by this script; # Supported environment variables by this script;
# #
# SAVE_SETTINGS_ON_EXIT=false # SAVE_SETTINGS_ON_EXIT=off
# Disables automatic settings saving. # Disables automatic settings saving.
# #
# RENDERER=SDL # RENDERER=SDL

View file

@ -4,6 +4,4 @@ When booting 'openmsx -control stdio < boot_stdio.xml'
It starts then in power off mode and without renderer for fast booting. It starts then in power off mode and without renderer for fast booting.
--> -->
<command>set power on</command> <command>set power on</command>
<command>set throttle off</command>
<command>set save_settings_on_exit off</command>
</openmsx-control> </openmsx-control>

View file

@ -73,5 +73,5 @@ if {[info exists ::env(FAIL_AFTER_PATH)] && ([string trim $::env(FAIL_AFTER_PATH
# Enables boot watch dog timer when FAIL_AFTER_BOOT env has a value. (124 see `man timeout`) # Enables boot watch dog timer when FAIL_AFTER_BOOT env has a value. (124 see `man timeout`)
if {[info exists ::env(FAIL_AFTER_BOOT)] && ([string trim $::env(FAIL_AFTER_BOOT)] != "")} { if {[info exists ::env(FAIL_AFTER_BOOT)] && ([string trim $::env(FAIL_AFTER_BOOT)] != "")} {
fail_after [string trim $::env(FAIL_AFTER_BOOT)] realtime fail_after_boot 124 fail_after [string trim $::env(FAIL_AFTER_BOOT)] realtime failed_boot 124
} }