[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 10/15] test-qapi-util: Use ERR_IS_* macros
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [RFC 10/15] test-qapi-util: Use ERR_IS_* macros |
Date: |
Tue, 13 Jun 2017 13:53:08 -0300 |
Signed-off-by: Eduardo Habkost <address@hidden>
---
tests/test-qapi-util.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c
index 374fa30078..fe232ef9ed 100644
--- a/tests/test-qapi-util.c
+++ b/tests/test-qapi-util.c
@@ -77,25 +77,25 @@ static void test_parse_qapi_name(void)
static void successfn(Error **errp)
{
- g_assert(!errp || !*errp);
+ g_assert(ERR_IS_IGNORED(errp) || !ERR_IS_SET(errp));
}
static void fail1(Error **errp)
{
- g_assert(!errp || !*errp);
+ g_assert(ERR_IS_IGNORED(errp) || !ERR_IS_SET(errp));
error_setg(errp, "error1");
- g_assert(!errp || *errp);
+ g_assert(ERR_IS_IGNORED(errp) || ERR_IS_SET(errp));
}
static void fail2(Error **errp)
{
- g_assert(!errp || !*errp);
+ g_assert(ERR_IS_IGNORED(errp) || !ERR_IS_SET(errp));
error_setg(errp, "error2");
- g_assert(!errp || *errp);
+ g_assert(ERR_IS_IGNORED(errp) || ERR_IS_SET(errp));
}
static void multifn(Error **errp)
@@ -124,13 +124,13 @@ static void test_propagate(void (*fn)(Error **), Error
**errp)
bool failed;
Error *local_err = NULL;
- g_assert(!errp || !*errp);
+ g_assert(ERR_IS_IGNORED(errp) || !ERR_IS_SET(errp));
fn(&local_err);
failed = !!local_err;
error_propagate(errp, local_err);
- g_assert(!errp || (failed == !!*errp));
+ g_assert(ERR_IS_IGNORED(errp) || (failed == !!ERR_IS_SET(errp)));
}
static void test_error_api(void)
--
2.11.0.259.g40922b1
- [Qemu-devel] [RFC 00/15] Error API: Flag errors in *errp even if errors are being ignored, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 02/15] error: New IGNORE_ERRORS macro, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 01/15] tests: Test cases for error API, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 03/15] Add qapi/error.h includes on files that will need it, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 05/15] qapi: Use IGNORE_ERRORS instead of NULL on generated code, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 06/15] test-qapi-util: Use IGNORE_ERRORS instead of NULL, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 08/15] error: New ERR_IS_* macros for checking Error** values, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 07/15] Manual changes to use IGNORE_ERRORS instead of NULL, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 10/15] test-qapi-util: Use ERR_IS_* macros,
Eduardo Habkost <=
- [Qemu-devel] [RFC 11/15] Manual changes to use ERR_IS_* macros, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 09/15] [coccinelle] Use ERR_IS_* macros, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 12/15] error: Make IGNORED_ERRORS not a NULL pointer, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 13/15] rdma: Simplify var declaration to avoid confusing Coccinelle, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 04/15] [coccinelle] Use IGNORE_ERRORS instead of NULL as errp argument, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 14/15] [coccinelle] Eliminate unnecessary local_err/error_propagate() usage, Eduardo Habkost, 2017/06/13
- [Qemu-devel] [RFC 15/15] [test only] Use 'Error *err[static 1]' instead of 'Error **errp' to catch NULL errp arguments, Eduardo Habkost, 2017/06/13