Skip to content

mb2hal tests: accept any comp id #2456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SebKuzminsky merged 1 commit into from
Apr 29, 2023
Merged

mb2hal tests: accept any comp id #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions tests/mb2hal/mb2hal.1a/checkresult
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -e

TESTDIR=$(dirname $1)
cd "${TESTDIR}"

# HAL assigns each component a unique component ID at load-time.
# The RTAI and uspace HAL implementations assign different component IDs,
# so remove all mentions of specific component IDs from the result file,
# so that a single `expected` file works for both.
sed --in-place --regexp-extended --expression='s/^(.*unloading HAL module \[)[0-9]+(.*)$/\1(ignored comp id)\2/' result

diff -u expected result
2 changes: 1 addition & 1 deletion tests/mb2hal/mb2hal.1a/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,6 @@ mb2hal main OK: Link thread loop and logic 0 created OK
mb2hal main OK: mb2hal is running
mb2hal quit_signal DEBUG: signal [15] received
mb2hal quit_cleanup DEBUG: started
mb2hal quit_cleanup DEBUG: unloading HAL module [4] ret[0]
mb2hal quit_cleanup DEBUG: unloading HAL module [(ignored comp id)] ret[0]
mb2hal quit_cleanup DEBUG: done OK
mb2hal main OK: going to exit!
13 changes: 13 additions & 0 deletions tests/mb2hal/mb2hal.1b/checkresult
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -e

TESTDIR=$(dirname $1)
cd "${TESTDIR}"

# HAL assigns each component a unique component ID at load-time.
# The RTAI and uspace HAL implementations assign different component IDs,
# so remove all mentions of specific component IDs from the result file,
# so that a single `expected` file works for both.
sed --in-place --regexp-extended --expression='s/^( *)[0-9]+(.*mb2hal.Modbus_fnct_.*)$/\1(ignored comp id)\2/' result

diff -u expected result
48 changes: 24 additions & 24 deletions tests/mb2hal/mb2hal.1b/expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
Component Pins:
Owner Type Dir Value Name
4 bit OUT FALSE mb2hal.Modbus_fnct_02.00
4 bit OUT FALSE mb2hal.Modbus_fnct_02.01
4 bit OUT FALSE mb2hal.Modbus_fnct_02.02
4 bit OUT FALSE mb2hal.Modbus_fnct_02.03
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.00
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.01
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.02
(ignored comp id) bit OUT FALSE mb2hal.Modbus_fnct_02.03

Component Pins:
Owner Type Dir Value Name
4 float OUT 0 mb2hal.Modbus_fnct_03.00.float
4 s32 OUT 0 mb2hal.Modbus_fnct_03.00.int
4 float OUT 0 mb2hal.Modbus_fnct_03.01.float
4 s32 OUT 0 mb2hal.Modbus_fnct_03.01.int
4 float OUT 0 mb2hal.Modbus_fnct_03.02.float
4 s32 OUT 0 mb2hal.Modbus_fnct_03.02.int
4 float OUT 0 mb2hal.Modbus_fnct_03.03.float
4 s32 OUT 0 mb2hal.Modbus_fnct_03.03.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.00.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.00.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.01.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.01.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.02.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.02.int
(ignored comp id) float OUT 0 mb2hal.Modbus_fnct_03.03.float
(ignored comp id) s32 OUT 0 mb2hal.Modbus_fnct_03.03.int

Component Pins:
Owner Type Dir Value Name
4 float IN 0 mb2hal.Modbus_fnct_06.00
4 float IN 0 mb2hal.Modbus_fnct_06.01
4 float IN 0 mb2hal.Modbus_fnct_06.02
4 float IN 0 mb2hal.Modbus_fnct_06.03
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.00
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.01
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.02
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_06.03

Component Pins:
Owner Type Dir Value Name
4 bit IN FALSE mb2hal.Modbus_fnct_15.00
4 bit IN FALSE mb2hal.Modbus_fnct_15.01
4 bit IN FALSE mb2hal.Modbus_fnct_15.02
4 bit IN FALSE mb2hal.Modbus_fnct_15.03
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.00
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.01
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.02
(ignored comp id) bit IN FALSE mb2hal.Modbus_fnct_15.03

Component Pins:
Owner Type Dir Value Name
4 float IN 0 mb2hal.Modbus_fnct_16.00
4 float IN 0 mb2hal.Modbus_fnct_16.01
4 float IN 0 mb2hal.Modbus_fnct_16.02
4 float IN 0 mb2hal.Modbus_fnct_16.03
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.00
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.01
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.02
(ignored comp id) float IN 0 mb2hal.Modbus_fnct_16.03