Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Trigger Distribution
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Trigger Distribution
Commits
55ff58bb
Commit
55ff58bb
authored
Aug 20, 2018
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sw:ut: fix compilation errors
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
5cdaae32
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
46 additions
and
40 deletions
+46
-40
Makefile
software/Makefile
+1
-1
wrtd-ut-common.c
software/unittest/wrtd-ut-common.c
+3
-2
wrtd-ut-input.c
software/unittest/wrtd-ut-input.c
+12
-12
wrtd-ut-op.c
software/unittest/wrtd-ut-op.c
+15
-10
wrtd-ut-output.c
software/unittest/wrtd-ut-output.c
+15
-15
No files found.
software/Makefile
View file @
55ff58bb
...
...
@@ -5,7 +5,7 @@ CURDIR:=$(shell /bin/pwd)
REPO_PARENT
?=
$(CURDIR)
/..
-include
$(REPO_PARENT)/parent_common.mk
DIRS
=
../dependencies/mock-turtle/software lib tools firmware
DIRS
=
../dependencies/mock-turtle/software lib tools firmware
unittest
all clean
:
$(DIRS)
...
...
software/unittest/wrtd-ut-common.c
View file @
55ff58bb
...
...
@@ -26,10 +26,11 @@ static void test_open_close(CuTest *tc)
{
struct
wrtd_node
*
wrtd
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertTrue
(
tc
,
!!
wrtd
);
CuAssertTrue
(
tc
,
wrtd_version_is_valid
(
wrtd
));
CuAssertTrue
(
tc
,
wrtd_out_is_valid
(
wrtd
));
CuAssertTrue
(
tc
,
wrtd_in_is_valid
(
wrtd
));
wrtd_close
(
wrtd
);
}
...
...
software/unittest/wrtd-ut-input.c
View file @
55ff58bb
...
...
@@ -32,7 +32,7 @@ static void test_ping(CuTest *tc)
{
struct
wrtd_node
*
wrtd
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_ping
(
wrtd
));
wrtd_close
(
wrtd
);
...
...
@@ -43,7 +43,7 @@ static void test_channels_enable(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
enable
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_enable
(
wrtd
,
i
,
1
));
...
...
@@ -59,7 +59,7 @@ static void test_channels_disable(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
enable
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_enable
(
wrtd
,
i
,
0
));
...
...
@@ -75,7 +75,7 @@ static void test_channels_arm(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
armed
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_arm
(
wrtd
,
i
,
1
));
...
...
@@ -90,7 +90,7 @@ static void test_channels_disarm(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
armed
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_arm
(
wrtd
,
i
,
0
));
...
...
@@ -106,7 +106,7 @@ static void test_trigger_mode(CuTest *tc)
struct
wrtd_input_state
st
;
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_trigger_mode_set
(
wrtd
,
i
,
WRTD_TRIGGER_MODE_SINGLE
));
...
...
@@ -128,7 +128,7 @@ static void test_trigger_assign(CuTest *tc)
unsigned
int
assigned
;
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
id
.
trigger
=
i
;
...
...
@@ -150,7 +150,7 @@ static void test_trigger_unassign(CuTest *tc)
unsigned
int
assigned
;
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_trigger_unassign
(
wrtd
,
i
));
...
...
@@ -173,7 +173,7 @@ static void test_trigger_software(CuTest *tc)
};
int
i
,
sent
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
/* It does not metter which channel we query, the sent triggers
value is global */
...
...
@@ -194,7 +194,7 @@ static void test_reset_counters(CuTest *tc)
struct
wrtd_input_state
st
;
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_in_counters_reset
(
wrtd
,
i
));
...
...
@@ -214,7 +214,7 @@ static void test_dead_time(CuTest *tc)
char
msg
[
128
];
int
i
,
k
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
-
1
,
wrtd_in_dead_time_set
(
wrtd
,
i
,
0
));
...
...
@@ -244,7 +244,7 @@ static void test_delay(CuTest *tc)
char
msg
[
128
];
int
i
,
k
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
!
wrtd
);
for
(
i
=
0
;
i
<
TDC_NUM_CHANNELS
;
i
++
)
{
for
(
k
=
1
;
k
<
8
;
k
<<=
1
)
{
...
...
software/unittest/wrtd-ut-op.c
View file @
55ff58bb
...
...
@@ -42,10 +42,11 @@ static void test_msg_loop(CuTest *tc)
struct
wrtd_input_state
sti
;
struct
wrtd_output_state
sto
;
wrtd
=
wrtd_open
_by_lun
(
1
);
wrtd
=
wrtd_open
(
2
);
CuAssertPtrNotNull
(
tc
,
wrtd
);
CuAssertIntEquals
(
tc
,
0
,
wrtd_cpu_restart
(
wrtd
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd
),
0
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd
),
1
));
sleep
(
10
);
/* Wait the White Rabbit link */
/* Output */
...
...
@@ -95,13 +96,15 @@ static void test_msg_wr(CuTest *tc)
struct
wrtd_output_state
sto
;
unsigned
int
prev_lb
,
prev_msg
;
wrtd_0
=
wrtd_open
_by_lun
(
1
);
wrtd_0
=
wrtd_open
(
2
);
CuAssertPtrNotNull
(
tc
,
wrtd_0
);
wrtd_1
=
wrtd_open
_by_lun
(
0
);
wrtd_1
=
wrtd_open
(
1
);
CuAssertPtrNotNull
(
tc
,
wrtd_1
);
CuAssertIntEquals
(
tc
,
0
,
wrtd_cpu_restart
(
wrtd_0
));
CuAssertIntEquals
(
tc
,
0
,
wrtd_cpu_restart
(
wrtd_1
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_0
),
0
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_0
),
1
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_1
),
0
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_1
),
1
));
sleep
(
10
);
/* Wait the White Rabbit link */
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_state_get
(
wrtd_1
,
0
,
&
sto
));
...
...
@@ -176,13 +179,15 @@ static void test_msg_mix(CuTest *tc)
struct
wrtd_output_state
sto1
,
sto2
;
unsigned
int
prev_msg_2
,
prev_msg_3
,
prev_msg_4
;
wrtd_0
=
wrtd_open
_by_lun
(
0
);
wrtd_0
=
wrtd_open
(
1
);
CuAssertPtrNotNull
(
tc
,
wrtd_0
);
wrtd_1
=
wrtd_open
_by_lun
(
1
);
wrtd_1
=
wrtd_open
(
2
);
CuAssertPtrNotNull
(
tc
,
wrtd_1
);
CuAssertIntEquals
(
tc
,
0
,
wrtd_cpu_restart
(
wrtd_0
));
CuAssertIntEquals
(
tc
,
0
,
wrtd_cpu_restart
(
wrtd_1
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_0
),
0
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_0
),
1
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_1
),
0
));
CuAssertIntEquals
(
tc
,
0
,
trtl_cpu_restart
(
wrtd_get_trtl_dev
(
wrtd_1
),
1
));
sleep
(
10
);
/* Wait the White Rabbit link */
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_state_get
(
wrtd_1
,
0
,
&
sto1
));
...
...
software/unittest/wrtd-ut-output.c
View file @
55ff58bb
...
...
@@ -32,7 +32,7 @@ static void test_ping(CuTest *tc)
{
struct
wrtd_node
*
wrtd
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_ping
(
wrtd
));
wrtd_close
(
wrtd
);
}
...
...
@@ -43,7 +43,7 @@ static void test_channels_enable(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
enable
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_enable
(
wrtd
,
i
,
1
));
...
...
@@ -59,7 +59,7 @@ static void test_channels_disable(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
enable
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_enable
(
wrtd
,
i
,
0
));
...
...
@@ -75,7 +75,7 @@ static void test_channels_arm(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
armed
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_arm
(
wrtd
,
i
,
1
));
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_is_armed
(
wrtd
,
i
,
&
armed
));
...
...
@@ -89,7 +89,7 @@ static void test_channels_disarm(CuTest *tc)
struct
wrtd_node
*
wrtd
;
unsigned
int
i
,
armed
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_arm
(
wrtd
,
i
,
0
));
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_is_armed
(
wrtd
,
i
,
&
armed
));
...
...
@@ -154,7 +154,7 @@ static void test_trigger_assign(CuTest *tc)
unsigned
int
assigned
;
int
i
,
ret
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_trig_get_all
(
wrtd
,
i
,
...
...
@@ -236,7 +236,7 @@ static void test_trigger_assign_cond(CuTest *tc)
unsigned
int
assigned
;
int
i
,
ret
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_trig_get_all
(
wrtd
,
i
,
...
...
@@ -306,7 +306,7 @@ static void test_trigger_unassign(CuTest *tc)
unsigned
int
assigned
;
unsigned
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
memset
(
&
trig
,
0
,
...
...
@@ -349,7 +349,7 @@ static void test_trigger_unassign_cond(CuTest *tc)
unsigned
int
assigned
;
unsigned
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
memset
(
&
trig
,
0
,
...
...
@@ -376,7 +376,7 @@ static void test_pulse_width(CuTest *tc)
unsigned
int
i
,
k
;
uint64_t
ps
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
-
1
,
wrtd_out_pulse_width_set
(
wrtd
,
i
,
0
));
CuAssertIntEquals
(
tc
,
errno
,
EWRTD_INVALID_PULSE_WIDTH
);
...
...
@@ -399,7 +399,7 @@ static void test_dead_time(CuTest *tc)
unsigned
int
i
,
k
;
uint64_t
ps
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
for
(
k
=
0
;
k
<
FD_NUM_CHANNELS
;
k
+=
10000
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_dead_time_set
(
wrtd
,
i
,
k
));
...
...
@@ -422,7 +422,7 @@ static void test_trigger_delay(CuTest *tc)
uint64_t
ps
,
min
,
max
;
int
i
,
k
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
id
.
source_port
=
i
;
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_trig_assign
(
wrtd
,
i
,
&
h
[
i
],
...
...
@@ -466,7 +466,7 @@ static void test_trigger_enable(CuTest *tc)
struct
wrtd_trig_id
id
=
{
9
,
9
,
9
};
int
i
,
k
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_trig_assign
(
wrtd
,
i
,
&
h
,
&
id
,
NULL
));
for
(
k
=
0
;
k
<
10
;
k
++
)
{
...
...
@@ -494,7 +494,7 @@ static void test_trigger_mode(CuTest *tc)
struct
wrtd_output_state
st
;
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_trigger_mode_set
(
wrtd
,
i
,
WRTD_TRIGGER_MODE_SINGLE
));
...
...
@@ -521,7 +521,7 @@ static void test_reset_counters(CuTest *tc)
struct
wrtd_output_state
st
;
int
i
;
wrtd
=
wrtd_open
_by_lun
(
0
);
wrtd
=
wrtd_open
(
1
);
for
(
i
=
0
;
i
<
FD_NUM_CHANNELS
;
i
++
)
{
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_counters_reset
(
wrtd
,
i
));
CuAssertIntEquals
(
tc
,
0
,
wrtd_out_state_get
(
wrtd
,
i
,
&
st
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment