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

Test timeout nop bomb #2

Open
willemtsade wants to merge 4 commits from test_ci_fail_hang into master
pull from: test_ci_fail_hang
merge into: arch-msx:master
Conversation 0 Commits 4 Files changed 1 +1 -7
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6353df9494 - Show all commits

8
lib/make/mb_openmsx.mk
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,7 @@ 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) $(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