tests: expose current state in local context of NMTST_WAIT()

Inside the loop-handler, it can be interesting to know the current iteration,
and how much time is left.

(cherry picked from commit 86dc1f1394)
(cherry picked from commit 945f51d623)
(cherry picked from commit 03b6653679)
This commit is contained in:
Thomas Haller 2018-06-20 14:41:03 +02:00 committed by Beniamino Galvani
parent e522b90d3f
commit e8b1a2613e

View file

@ -140,10 +140,16 @@
const gint64 nmtst_wait_start_us = g_get_monotonic_time (); \
const gint64 nmtst_wait_duration_us = (max_wait_ms) * 1000L; \
const gint64 nmtst_wait_end_us = nmtst_wait_start_us + nmtst_wait_duration_us; \
gint64 _nmtst_wait_remaining_us = nmtst_wait_duration_us; \
int _nmtst_wait_iteration = 0; \
\
while (TRUE) { \
_nm_unused const gint64 nmtst_wait_remaining_us = _nmtst_wait_remaining_us; \
_nm_unused int nmtst_wait_iteration = _nmtst_wait_iteration++; \
\
{ wait }; \
if (g_get_monotonic_time () > nmtst_wait_end_us) { \
_nmtst_wait_remaining_us = (nmtst_wait_end_us - g_get_monotonic_time ()); \
if (_nmtst_wait_remaining_us <= 0) { \
_not_expired = FALSE; \
break; \
} \