Skip to content

Commit 0d4647d

Browse files
committed
Merge remote-tracking branch 'origin/2.8' into 2.9
* origin/2.8: mb2hal test: remove signal timing requirement
2 parents 4c759f1 + 4b2ef62 commit 0d4647d

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

tests/mb2hal/mb2hal.1a/checkresult

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,9 @@ cd "${TESTDIR}"
1010
# so that a single `expected` file works for both.
1111
sed --in-place --regexp-extended --expression='s/^(.*unloading HAL module \[)[0-9]+(.*)$/\1(ignored comp id)\2/' result
1212

13+
# The SIGQUIT signal does not arrive at a well-defined time, so don't
14+
# check for that debug log message. The rest of the shutdown messages
15+
# seem to have well-defined order.
16+
sed --in-place --regexp-extended --expression='/^mb2hal quit_signal DEBUG: signal \[15\] received$/d' result
17+
1318
diff -u expected result

tests/mb2hal/mb2hal.1a/expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ mb2hal create_each_mb_tx_hal_pins DEBUG: mb_tx_num [4] pin_name [mb2hal.Modbus_f
125125
mb2hal main OK: HAL components created OK
126126
mb2hal main OK: Link thread loop and logic 0 created OK
127127
mb2hal main OK: mb2hal is running
128-
mb2hal quit_signal DEBUG: signal [15] received
129128
mb2hal quit_cleanup DEBUG: started
130129
mb2hal quit_cleanup DEBUG: unloading HAL module [(ignored comp id)] ret[0]
131130
mb2hal quit_cleanup DEBUG: done OK

0 commit comments

Comments
 (0)