michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: net: tcp2: Add more debugging info

Browse source 
It is useful to know which test fails to semaphore timeout so
add line number of the failing test to assert print.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
This commit is contained in:
Jukka Rissanen 2020-04-17 15:46:37 +03:00
commit cb4c09d702
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/net/tcp2/src/main.c
View file

@ -149,13 +149,13 @@ static void test_sem_give(void)
k_sem_give(&test_sem); k_sem_give(&test_sem);
} }
static void test_sem_take(k_timeout_t timeout) static void test_sem_take(k_timeout_t timeout, int line)
{ {
sem = true; sem = true;
k_sem_take(&test_sem, timeout); k_sem_take(&test_sem, timeout);
if (sem) { if (sem) {
zassert_true(false, "semaphore timed out"); zassert_true(false, "semaphore timed out (line %d)", line);
} }
} }
@ -467,7 +467,7 @@ static void test_client_ipv4(void)
/* Peer will release the semaphone after it receives /* Peer will release the semaphone after it receives
* proper ACK to SYN | ACK * proper ACK to SYN | ACK
*/ */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
ret = net_context_send(ctx, &data, 1, NULL, K_NO_WAIT, NULL); ret = net_context_send(ctx, &data, 1, NULL, K_NO_WAIT, NULL);
if (ret < 0) { if (ret < 0) {
@ -475,14 +475,14 @@ static void test_client_ipv4(void)
} }
/* Peer will release the semaphone after it sends ACK for data */ /* Peer will release the semaphone after it sends ACK for data */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
net_tcp_put(ctx); net_tcp_put(ctx);
/* Peer will release the semaphone after it receives /* Peer will release the semaphone after it receives
* proper ACK to FIN | ACK * proper ACK to FIN | ACK
*/ */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
} }
/* Test case scenario IPv6 /* Test case scenario IPv6
@ -522,7 +522,7 @@ static void test_client_ipv6(void)
/* Peer will release the semaphone after it receives /* Peer will release the semaphone after it receives
* proper ACK to SYN | ACK * proper ACK to SYN | ACK
*/ */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
ret = net_context_send(ctx, &data, 1, NULL, K_NO_WAIT, NULL); ret = net_context_send(ctx, &data, 1, NULL, K_NO_WAIT, NULL);
if (ret < 0) { if (ret < 0) {
@ -530,14 +530,14 @@ static void test_client_ipv6(void)
} }
/* Peer will release the semaphone after it sends ACK for data */ /* Peer will release the semaphone after it sends ACK for data */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
net_tcp_put(ctx); net_tcp_put(ctx);
/* Peer will release the semaphone after it receives /* Peer will release the semaphone after it receives
* proper ACK to FIN | ACK * proper ACK to FIN | ACK
*/ */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
} }
static void handle_server_test(sa_family_t af, struct tcphdr *th) static void handle_server_test(sa_family_t af, struct tcphdr *th)
@ -681,7 +681,7 @@ static void test_server_ipv4(void)
/* test_tcp_accept_cb will release the semaphone after succesfull /* test_tcp_accept_cb will release the semaphone after succesfull
* connection. * connection.
*/ */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
/* Trigger the peer to send DATA */ /* Trigger the peer to send DATA */
k_delayed_work_submit(&test_server, K_NO_WAIT); k_delayed_work_submit(&test_server, K_NO_WAIT);
@ -744,7 +744,7 @@ static void test_server_with_options_ipv4(void)
/* test_tcp_accept_cb will release the semaphone after succesfull /* test_tcp_accept_cb will release the semaphone after succesfull
* connection. * connection.
*/ */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
/* Trigger the peer to send DATA */ /* Trigger the peer to send DATA */
k_delayed_work_submit(&test_server, K_NO_WAIT); k_delayed_work_submit(&test_server, K_NO_WAIT);
@ -807,7 +807,7 @@ static void test_server_ipv6(void)
/* test_tcp_accept_cb will release the semaphone after succesfull /* test_tcp_accept_cb will release the semaphone after succesfull
* connection. * connection.
*/ */
test_sem_take(K_MSEC(100)); test_sem_take(K_MSEC(100), __LINE__);
/* Trigger the peer to send DATA */ /* Trigger the peer to send DATA */
k_delayed_work_submit(&test_server, K_NO_WAIT); k_delayed_work_submit(&test_server, K_NO_WAIT);
@ -863,7 +863,7 @@ static void test_client_syn_resend(void)
} }
/* test handler will release the sem once it receives SYN again */ /* test handler will release the sem once it receives SYN again */
test_sem_take(K_MSEC(500)); test_sem_take(K_MSEC(500), __LINE__);
net_context_put(ctx); net_context_put(ctx);
} }