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

Compare commits

base: arch-msx:40fe6ae015286fdd7778200000a0cbc9d5d8e8c2
Branches Tags
arch-msx:master
arch-msx:test_ci_parallel_build
arch-msx:test_ci_fail_match
arch-msx:test_ci_fail_hang
arch-msx:test_ci_fail_boot
..
compare: arch-msx:dc8b8a535e9167bdd2460f060262cfba6467df2d
Branches Tags
arch-msx:master
arch-msx:test_ci_parallel_build
arch-msx:test_ci_fail_match
arch-msx:test_ci_fail_hang
arch-msx:test_ci_fail_boot

2 commits
40fe6ae015 ... dc8b8a535e

Author SHA1 Message Date
Willem
dc8b8a535e Fixed message for mode 40 output.
All checks were successful
Run test asserts / Test-Asserts (push) Successful in -7s
Details
2024-06-28 18:52:59 +02:00
Willem
5051de99fe Fixed reboot watchdog fail safe. 2024-06-28 18:17:54 +02:00
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/openmsx/share/scripts/fail_after.tcl
View file

@ -2,7 +2,7 @@
# #
# Typically used in combination with the MSX-DOS 'omsxctl.com' utility. # Typically used in combination with the MSX-DOS 'omsxctl.com' utility.
# #
# Adds two environment variables and two commands to openMSX; # Adds two commands to openMSX;
# #
# 'fail_after timeout [timeunit] [fail_id] [fail_code]' # 'fail_after timeout [timeunit] [fail_id] [fail_code]'
# Schedules an openMSX exit after the timeout. # Schedules an openMSX exit after the timeout.
@ -54,17 +54,26 @@ proc fail_after { timeout {time_unit "time"} {fail_id "fail_after"} {fail_code 2
puts stderr "error: $err_msg" puts stderr "error: $err_msg"
fail_after_exit fail_after_timer_error 1 fail_after_exit fail_after_timer_error 1
} }
set msg "$msg\n$fail_id: Automatic failure in $timeout $time_unit seconds." set msg "$msg\n$fail_id: Failure in $timeout $time_unit sec"
} else { } else {
set fail_after_prev_timer 0 set fail_after_prev_timer 0
} }
return $msg return $msg
} }
proc fail_after_reboot_watchdog {} {
global fail_after_boot_timeout
if {$fail_after_boot_timeout != 0} {
fail_after $fail_after_boot_timeout realtime failed_boot 124
after boot "fail_after_reboot_watchdog"
}
}
# Globals # Globals
set fail_after_prev_timer 0 set fail_after_prev_timer 0
set fail_after_prev_id 0 set fail_after_prev_id 0
set fail_after_path 0 set fail_after_path 0
set fail_after_boot_timeout 0
# Parse screenshot path env setting # Parse screenshot path env setting
if {[info exists ::env(FAIL_AFTER_PATH)] && ([string trim $::env(FAIL_AFTER_PATH)] != "")} { if {[info exists ::env(FAIL_AFTER_PATH)] && ([string trim $::env(FAIL_AFTER_PATH)] != "")} {
@ -73,5 +82,6 @@ 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 failed_boot 124 set fail_after_boot_timeout [string trim $::env(FAIL_AFTER_BOOT)]
fail_after_reboot_watchdog
} }