Skip to content

Commit 011d31f

Browse files
vrahanevrahane
committed
sys/log: Fix unittest build errors
1 parent 05458a4 commit 011d31f

11 files changed

+65
-40
lines changed

‎sys/log/full/selftest/util/include/log_test_util/log_test_util.h

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ extern struct fcb2 log_fcb;
4141
#endif
4242
extern struct log my_log;
4343
extern char *ltu_str_logs[];
44+
extern uint8_t dummy_log_arr[];
4445

4546
struct os_mbuf *ltu_flat_to_fragged_mbuf(const void *flat, int len,
4647
int frag_sz);
@@ -49,6 +50,9 @@ void ltu_setup_2fcbs(struct fcb_log *fcb_log1, struct log *log1,
4950
struct fcb_log *fcb_log2, struct log *log2);
5051
void ltu_setup_cbmem(struct cbmem *cbmem, struct log *log);
5152
void ltu_verify_contents(struct log *log);
53+
uint16_t *ltu_get_ltu_off_arr(void);
54+
uint16_t ltu_init_arr(void);
55+
int ltu_num_strs(void);
5256

5357
TEST_SUITE_DECL(log_test_suite_cbmem_flat);
5458
TEST_CASE_DECL(log_test_case_cbmem_append);

‎sys/log/full/selftest/util/src/log_test_util.c

+13-10
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919

2020
#include "log_test_util/log_test_util.h"
21+
#include "log/log.h"
2122

2223
#if MYNEWT_VAL(LOG_FCB)
2324
static struct flash_area fcb_areas[] = {
@@ -47,26 +48,26 @@ static int ltu_str_idx = 0;
4748
static int ltu_str_max_idx = 0;
4849

4950
struct dummy_log {
50-
struct log_entry_hdr ueh;
51-
struct log_tlv;
51+
struct log_entry_hdr hdr;
52+
struct log_tlv tlv;
5253
uint32_t num_entries;
53-
}
54+
};
5455

5556
struct dummy_log dummy_log = {
5657
.hdr = {
5758
.ue_ts = 1,
5859
.ue_module = 2,
59-
.ue_etype = 3
60-
.ue_flags =
60+
.ue_etype = 3,
61+
.ue_flags = 0
6162
#if MYNEWT_VAL(LOG_FLAGS_IMAGE_HASH)
62-
LOG_FLAGS_IMAGE_HASH
63+
| LOG_FLAGS_IMG_HASH
6364
#endif
6465
#if MYNEWT_VAL(LOG_FLAGS_TLV_SUPPORT)
6566
| LOG_FLAGS_TLV_SUPPORT
6667
#endif
6768
,
6869
.ue_etype = 4,
69-
.ue_imghash = 0x12345678,
70+
.ue_imghash = {1, 2, 3, 4},
7071
.ue_level = 3,
7172
.ue_num_entries = 5
7273
},
@@ -85,7 +86,7 @@ char *ltu_str_logs[] = {
8586
NULL
8687
};
8788

88-
struct uint16_t ltu_off_arr[5];
89+
uint16_t ltu_off_arr[5];
8990

9091
uint8_t dummy_log_arr[sizeof(ltu_str_logs) + sizeof(struct dummy_log)*4];
9192

@@ -101,14 +102,16 @@ ltu_num_strs(void)
101102
return i;
102103
}
103104

104-
uint16_t *ltu_get_ltu_off_arr(void)
105+
uint16_t *
106+
ltu_get_ltu_off_arr(void)
105107
{
106108
return ltu_off_arr;
107109
}
108110

109111
uint16_t
110112
ltu_init_arr(void)
111113
{
114+
int i;
112115
uint16_t offset = 0;
113116

114117
for (i = 0; i < ltu_num_strs(); i++) {
@@ -120,7 +123,7 @@ ltu_init_arr(void)
120123
&dummy_log.hdr.ue_imghash, LOG_IMG_HASHLEN);
121124
offset += LOG_IMG_HASHLEN;
122125
#endif
123-
memcpy(dummy_log_arr + offset, ltu_str_logs[i], sizeof(ltu_str_logs[i]));
126+
memcpy(dummy_log_arr + offset, ltu_str_logs[i], strlen(ltu_str_logs[i]));
124127
offset += sizeof(ltu_str_logs[i]);
125128
#if MYNEWT_VAL(LOG_FLAGS_TLV_SUPPORT) && MYNEWT_VAL(LOG_TLV_NUM_ENTRIES)
126129
memcpy(dummy_log_arr + offset, &dummy_log.tlv, sizeof(struct log_tlv));

‎sys/log/full/selftest/util/src/testcases/log_test_case_cbmem_append.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ TEST_CASE_SELF(log_test_case_cbmem_append)
2727
uint16_t *off_arr;
2828
int i;
2929
int rc;
30+
int num_strs = ltu_num_strs();
3031

3132
ltu_setup_cbmem(&cbmem, &log);
3233
len = ltu_init_arr();
3334
TEST_ASSERT_FATAL(len != 0);
3435

3536
off_arr = ltu_get_ltu_off_arr();
36-
TEST_ASSERT_FATAL(arr != NULL);
37+
TEST_ASSERT_FATAL(off_arr != NULL);
3738

3839
for (i = 0; i < num_strs; i++) {
3940
len = off_arr[i+1] - off_arr[i];

‎sys/log/full/selftest/util/src/testcases/log_test_case_cbmem_append_body.c

+6-5
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@ TEST_CASE_SELF(log_test_case_cbmem_append_body)
3535
TEST_ASSERT_FATAL(len != 0);
3636

3737
off_arr = ltu_get_ltu_off_arr();
38-
TEST_ASSERT_FATAL(arr != NULL);
38+
TEST_ASSERT_FATAL(off_arr != NULL);
3939

4040
for (i = 0; i < num_strs; i++) {
41-
hdr = dummy_log_arr + off_arr[i];
41+
hdr = (struct log_entry_hdr *)(dummy_log_arr + off_arr[i]);
4242
len = off_arr[i + 1] - off_arr[i] -
4343
log_hdr_len(hdr) - log_trailer_len(hdr);
44-
log_append_body(&log, 2, 3, LOG_ETYPE_STRING,
45-
dummy_log_arr + off_arr[i] + log_hdr_len(hdr),
46-
len);
44+
rc = log_append_body(&log, 2, 3, LOG_ETYPE_STRING,
45+
dummy_log_arr + off_arr[i] + log_hdr_len(hdr),
46+
len);
47+
TEST_ASSERT_FATAL(rc == 0);
4748
}
4849

4950
ltu_verify_contents(&log);

‎sys/log/full/selftest/util/src/testcases/log_test_case_cbmem_append_mbuf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ TEST_CASE_SELF(log_test_case_cbmem_append_mbuf)
3535
TEST_ASSERT_FATAL(len != 0);
3636

3737
off_arr = ltu_get_ltu_off_arr();
38-
TEST_ASSERT_FATAL(arr != NULL);
38+
TEST_ASSERT_FATAL(off_arr != NULL);
3939

4040
for (i = 0; i < num_strs; i++) {
4141
len = off_arr[i+1] - off_arr[i];

‎sys/log/full/selftest/util/src/testcases/log_test_case_cbmem_append_mbuf_body.c

+8-3
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,25 @@ TEST_CASE_SELF(log_test_case_cbmem_append_mbuf_body)
2626
struct log log;
2727
int rc;
2828
int i;
29+
uint16_t len;
2930
int num_strs = ltu_num_strs();
31+
struct log_entry_hdr *hdr;
32+
uint16_t *off_arr;
3033

3134
ltu_setup_cbmem(&cbmem, &log);
3235
len = ltu_init_arr();
3336
TEST_ASSERT_FATAL(len != 0);
3437

3538
off_arr = ltu_get_ltu_off_arr();
36-
TEST_ASSERT_FATAL(arr != NULL);
39+
TEST_ASSERT_FATAL(off_arr != NULL);
3740

3841
for (i = 0; num_strs; i++) {
39-
len = off_arr[i+1] - off_arr[i];
42+
hdr = (struct log_entry_hdr *)(dummy_log_arr + off_arr[i]);
43+
len = off_arr[i + 1] - off_arr[i] -
44+
log_hdr_len(hdr) - log_trailer_len(hdr);
4045

4146
/* Split chain into several mbufs. */
42-
om = ltu_flat_to_fragged_mbuf(dummy_log_arr + off_arr[i],
47+
om = ltu_flat_to_fragged_mbuf(dummy_log_arr + off_arr[i] + log_hdr_len(hdr),
4348
len, 2);
4449

4550
rc = log_append_mbuf_body(&log, 2, 3, LOG_ETYPE_STRING, om);

‎sys/log/full/selftest/util/src/testcases/log_test_case_cbmem_printf.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ TEST_CASE_SELF(log_test_case_cbmem_printf)
2424
struct cbmem cbmem;
2525
struct log log;
2626
int i;
27-
int rc;
2827
uint16_t len = 0;
2928
int num_strs = ltu_num_strs();
29+
uint16_t *off_arr;
3030

3131
ltu_setup_cbmem(&cbmem, &log);
3232
len = ltu_init_arr();
3333
TEST_ASSERT_FATAL(len != 0);
3434

3535
off_arr = ltu_get_ltu_off_arr();
36-
TEST_ASSERT_FATAL(arr != NULL);
36+
TEST_ASSERT_FATAL(off_arr != NULL);
3737

3838
for (i = 0; i < num_strs; i++) {
3939
len = off_arr[i+1] - off_arr[i];
40-
log_printf(&log, 0, 0, dummy_log_arr + off_arr[i],
40+
log_printf(&log, 0, 0, (char *)(dummy_log_arr + off_arr[i]),
4141
len);
4242
}
4343

‎sys/log/full/selftest/util/src/testcases/log_test_case_fcb_append.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ TEST_CASE_SELF(log_test_case_fcb_append)
2525
struct log log;
2626
uint16_t len = 0;
2727
uint16_t *off_arr;
28-
int body_len;
2928
int i;
3029
int rc;
30+
int num_strs = ltu_num_strs();
3131

3232
ltu_setup_fcb(&fcb_log, &log);
3333
len = ltu_init_arr();
3434
TEST_ASSERT_FATAL(len != 0);
3535

3636
off_arr = ltu_get_ltu_off_arr();
37-
TEST_ASSERT_FATAL(arr != NULL);
37+
TEST_ASSERT_FATAL(off_arr != NULL);
3838

3939
for (i = 0; num_strs; i++) {
4040
len = off_arr[i+1] - off_arr[i];

‎sys/log/full/selftest/util/src/testcases/log_test_case_fcb_append_body.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,18 @@ TEST_CASE_SELF(log_test_case_fcb_append_body)
3535
TEST_ASSERT_FATAL(len != 0);
3636

3737
off_arr = ltu_get_ltu_off_arr();
38-
TEST_ASSERT_FATAL(arr != NULL);
38+
TEST_ASSERT_FATAL(off_arr != NULL);
3939

4040
for (i = 0; i < num_strs; i++) {
41-
hdr = dummy_log_arr + off_arr[i];
41+
hdr = (struct log_entry_hdr *)(dummy_log_arr + off_arr[i]);
4242
len = off_arr[i + 1] - off_arr[i] -
4343
log_hdr_len(hdr) - log_trailer_len(hdr);
44-
log_append_body(&log, 2, 3, LOG_ETYPE_STRING,
45-
dummy_log_arr + off_arr[i] + log_hdr_len(hdr),
46-
len);
44+
rc = log_append_body(&log, 2, 3, LOG_ETYPE_STRING,
45+
dummy_log_arr + off_arr[i] + log_hdr_len(hdr),
46+
len);
47+
TEST_ASSERT_FATAL(rc == 0);
4748
}
49+
4850
ltu_verify_contents(&log);
4951

5052
}

‎sys/log/full/selftest/util/src/testcases/log_test_case_fcb_append_mbuf.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,18 @@ TEST_CASE_SELF(log_test_case_fcb_append_mbuf)
2424
struct fcb_log fcb_log;
2525
struct os_mbuf *om;
2626
struct log log;
27-
char *str;
2827
int rc;
2928
int i;
3029
int num_strs = ltu_num_strs();
30+
uint16_t *off_arr;
31+
uint16_t len;
3132

3233
ltu_setup_fcb(&fcb_log, &log);
3334
len = ltu_init_arr();
3435
TEST_ASSERT_FATAL(len != 0);
3536

3637
off_arr = ltu_get_ltu_off_arr();
37-
TEST_ASSERT_FATAL(arr != NULL);
38+
TEST_ASSERT_FATAL(off_arr != NULL);
3839

3940
for (i = 0; i < num_strs; i++) {
4041
len = off_arr[i+1] - off_arr[i];

‎sys/log/full/selftest/util/src/testcases/log_test_case_fcb_append_mbuf_body.c

+16-8
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,30 @@ TEST_CASE_SELF(log_test_case_fcb_append_mbuf_body)
2424
struct fcb_log fcb_log;
2525
struct os_mbuf *om;
2626
struct log log;
27-
char *str;
2827
int rc;
2928
int i;
29+
int num_strs = ltu_num_strs();
30+
struct log_entry_hdr *hdr;
31+
uint16_t *off_arr;
32+
uint16_t len;
3033

3134
ltu_setup_fcb(&fcb_log, &log);
35+
len = ltu_init_arr();
36+
TEST_ASSERT_FATAL(len != 0);
3237

33-
for (i = 0; ; i++) {
34-
str = ltu_str_logs[i];
35-
if (!str) {
36-
break;
37-
}
38+
off_arr = ltu_get_ltu_off_arr();
39+
TEST_ASSERT_FATAL(off_arr != NULL);
40+
41+
for (i = 0; num_strs; i++) {
42+
hdr = (struct log_entry_hdr *)(dummy_log_arr + off_arr[i]);
43+
len = off_arr[i + 1] - off_arr[i] -
44+
log_hdr_len(hdr) - log_trailer_len(hdr);
3845

3946
/* Split chain into several mbufs. */
40-
om = ltu_flat_to_fragged_mbuf(str, strlen(str), 2);
47+
om = ltu_flat_to_fragged_mbuf(dummy_log_arr + off_arr[i] + log_hdr_len(hdr),
48+
len, 2);
4149

42-
rc = log_append_mbuf_body(&log, 0, 0, LOG_ETYPE_STRING, om);
50+
rc = log_append_mbuf_body(&log, 2, 3, LOG_ETYPE_STRING, om);
4351
TEST_ASSERT_FATAL(rc == 0);
4452
}
4553

0 commit comments

Comments
 (0)