diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-05-09 11:04:51 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-05-09 11:04:51 +0200 |
| commit | fbf4904ae004159959b4b3e203810badc079021e (patch) | |
| tree | bbad0c60bbfe8068583bbfddeddc1eb047ccd536 | |
| parent | 13ab20fe8ca5069ac5df26e9116322922f66cd9c (diff) | |
| download | NetworkManager-fbf4904ae004159959b4b3e203810badc079021e.tar.gz | |
nmtst: allow non-boolean argument to nmtst_assert_success()
Reimplement nmtst_assert_success() as a macro which allows non-boolean @success
arguments.
| -rw-r--r-- | shared/nm-test-utils.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/shared/nm-test-utils.h b/shared/nm-test-utils.h index 0759b3c4fd..0875518cdd 100644 --- a/shared/nm-test-utils.h +++ b/shared/nm-test-utils.h @@ -153,13 +153,11 @@ g_assert_not_reached (); \ } G_STMT_END -inline static void -_nmtst_assert_success (gboolean success, GError *error, const char *file, int line) -{ - if (!success || error) - g_error ("(%s:%d) FAILURE success=%d, error=%s", file, line, success, error ? error->message : "(no error)"); -} -#define nmtst_assert_success(success, error) _nmtst_assert_success ((success), (error), __FILE__, __LINE__) +#define nmtst_assert_success(success, error) \ + G_STMT_START { \ + g_assert_no_error (error); \ + g_assert ((success)); \ + } G_STMT_END #define nmtst_assert_no_success(success, error) \ G_STMT_START { \ |