fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-27 05:50:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndisc/tests: make assertion checks a macro and not a function in test-ndisc-fake

Browse source 
By having it a function, the assertion failure does not show the line
number of the origin. Make them a macro, so that we see where exactly it
failed.

(cherry picked from commit 3b896cc642)
(cherry picked from commit b1a7eda71d)
(cherry picked from commit 8316943338)
(cherry picked from commit 017bfbf4d7)
(cherry picked from commit 95beb170ea)
This commit is contained in:
Thomas Haller 2020-07-02 16:28:37 +02:00
parent 3b51a05187
commit 1bf2184087
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 38 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/ndisc/tests/test-ndisc-fake.c
View file

@ -62,44 +62,45 @@ match_gateway (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts
g_assert_cmpint (gw->preference, ==, pref);
}
static void
match_address (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts, guint32 lt, guint32 preferred)
{
const NMNDiscAddress *a;
char buf[INET6_ADDRSTRLEN];
#define match_address(rdata, idx, addr, ts, lt, pref) \
G_STMT_START { \
const NMNDiscData *_rdata = (rdata); \
guint _idx = (idx); \
const NMNDiscAddress *_a; \
\
g_assert (_rdata); \
g_assert_cmpint (_idx, <, _rdata->addresses_n); \
g_assert (_rdata->addresses); \
\
_a = &_rdata->addresses[_idx]; \
\
nmtst_assert_ip6_address (&_a->address, (addr)); \
g_assert_cmpint (_a->timestamp, ==, (ts)); \
g_assert_cmpint (_a->lifetime, ==, (lt)); \
g_assert_cmpint (_a->preferred, ==, (pref)); \
} G_STMT_END
g_assert (rdata);
g_assert_cmpint (idx, <, rdata->addresses_n);
g_assert (rdata->addresses);
a = &rdata->addresses[idx];
g_assert_cmpstr (inet_ntop (AF_INET6, &a->address, buf, sizeof (buf)), ==, addr);
g_assert_cmpint (a->timestamp, ==, ts);
g_assert_cmpint (a->lifetime, ==, lt);
g_assert_cmpint (a->preferred, ==, preferred);
}
static void
match_route (const NMNDiscData *rdata, guint idx, const char *nw, int plen, const char *gw, guint32 ts, guint32 lt, NMIcmpv6RouterPref pref)
{
const NMNDiscRoute *route;
char buf[INET6_ADDRSTRLEN];
g_assert (rdata);
g_assert_cmpint (idx, <, rdata->routes_n);
g_assert (rdata->routes);
g_assert (plen > 0 && plen <= 128);
route = &rdata->routes[idx];
g_assert_cmpstr (inet_ntop (AF_INET6, &route->network, buf, sizeof (buf)), ==, nw);
g_assert_cmpint ((int) route->plen, ==, plen);
g_assert_cmpstr (inet_ntop (AF_INET6, &route->gateway, buf, sizeof (buf)), ==, gw);
g_assert_cmpint (route->timestamp, ==, ts);
g_assert_cmpint (route->lifetime, ==, lt);
g_assert_cmpint (route->preference, ==, pref);
}
#define match_route(rdata, idx, nw, pl, gw, ts, lt, pref) \
G_STMT_START { \
const NMNDiscData *_rdata = (rdata); \
guint _idx = (idx); \
const NMNDiscRoute *_r; \
int _plen = (pl); \
\
g_assert (_rdata); \
g_assert_cmpint (_idx, <, _rdata->routes_n); \
g_assert (_rdata->routes); \
g_assert (_plen > 0 && _plen <= 128); \
\
_r = &_rdata->routes[idx]; \
\
nmtst_assert_ip6_address (&_r->network, (nw)); \
g_assert_cmpint ((int) _r->plen, ==, _plen); \
nmtst_assert_ip6_address (&_r->gateway, (gw)); \
g_assert_cmpint (_r->timestamp, ==, (ts)); \
g_assert_cmpint (_r->lifetime, ==, (lt)); \
g_assert_cmpint (_r->preference, ==, (pref)); \
} G_STMT_END
static void
match_dns_server (const NMNDiscData *rdata, guint idx, const char *addr, guint32 ts, guint32 lt)