Skip to content

Commit db1ef67

Browse files
committed
tests: Fixes for rtapi no autostop
Due to rtapi_app is started before anything else, the hal-show expected owner id is increased by two. The raster test needs to be started with halrun to have realtime started and stopped properly.
1 parent cf57422 commit db1ef67

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

tests/hal-show/expected

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Component Pins:
22
Owner Type Dir Value Name
3-
8 bit IN FALSE conv-bit-u32.0.in <== net-conv-bit-u32.0.in
4-
14 float IN 0 conv-float-s32.0.in <== net-conv-float-s32.0.in
5-
17 s32 IN 0 conv-s32-float.0.in <== net-conv-s32-float.0.in
6-
20 s64 IN 0 conv-s64-u64.0.in <== net-conv-s64-u64.0.in
7-
11 u32 IN 0x00000000 conv-u32-bit.0.in <== net-conv-u32-bit.0.in
8-
23 u64 IN 0x0000000000000000 conv-u64-s64.0.in <== net-conv-u64-s64.0.in
3+
10 bit IN FALSE conv-bit-u32.0.in <== net-conv-bit-u32.0.in
4+
16 float IN 0 conv-float-s32.0.in <== net-conv-float-s32.0.in
5+
19 s32 IN 0 conv-s32-float.0.in <== net-conv-s32-float.0.in
6+
22 s64 IN 0 conv-s64-u64.0.in <== net-conv-s64-u64.0.in
7+
13 u32 IN 0x00000000 conv-u32-bit.0.in <== net-conv-u32-bit.0.in
8+
25 u64 IN 0x0000000000000000 conv-u64-s64.0.in <== net-conv-u64-s64.0.in
99

1010
Signals:
1111
Type Value Name (linked to)
@@ -36,12 +36,12 @@ s64 0 net-conv-u64-s64.0.out
3636

3737
Component Pins:
3838
Owner Type Dir Value Name
39-
8 bit IN TRUE conv-bit-u32.0.in <== net-conv-bit-u32.0.in
40-
14 float IN 2.147484e+09 conv-float-s32.0.in <== net-conv-float-s32.0.in
41-
17 s32 IN -2147483648 conv-s32-float.0.in <== net-conv-s32-float.0.in
42-
20 s64 IN -9223372036854775808 conv-s64-u64.0.in <== net-conv-s64-u64.0.in
43-
11 u32 IN 0xFFFFFFFF conv-u32-bit.0.in <== net-conv-u32-bit.0.in
44-
23 u64 IN 0xFFFFFFFFFFFFFFFF conv-u64-s64.0.in <== net-conv-u64-s64.0.in
39+
10 bit IN TRUE conv-bit-u32.0.in <== net-conv-bit-u32.0.in
40+
16 float IN 2.147484e+09 conv-float-s32.0.in <== net-conv-float-s32.0.in
41+
19 s32 IN -2147483648 conv-s32-float.0.in <== net-conv-s32-float.0.in
42+
22 s64 IN -9223372036854775808 conv-s64-u64.0.in <== net-conv-s64-u64.0.in
43+
13 u32 IN 0xFFFFFFFF conv-u32-bit.0.in <== net-conv-u32-bit.0.in
44+
25 u64 IN 0xFFFFFFFFFFFFFFFF conv-u64-s64.0.in <== net-conv-u64-s64.0.in
4545

4646
Signals:
4747
Type Value Name (linked to)
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ def main():
252252
finally:
253253
c.exit()
254254
prog.exit()
255-
os.system('halrun -U')
256255
return 0
257256

258257
if __name__ == "__main__":

tests/raster/test.hal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
loadusr -w ./rastertest.py

0 commit comments

Comments
 (0)