aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-09-26 14:29:33 +0200
committerMarkus Armbruster <armbru@redhat.com>2018-10-10 08:00:37 +0200
commit70b1105930e71813a22f40e4139adcc5d540a5f0 (patch)
tree77e0487a09f16eeb4884bde2e7ecb261f7d638ed /tests
parent992159c79fa894b53640d66affcfde5a4799c446 (diff)
downloadqemu-70b1105930e71813a22f40e4139adcc5d540a5f0.zip
qemu-70b1105930e71813a22f40e4139adcc5d540a5f0.tar.gz
qemu-70b1105930e71813a22f40e4139adcc5d540a5f0.tar.bz2
libqtest: Inline g_assert_no_errno()
Macro g_assert_no_errno() intrudes into GLib's namespace. It's also pretty pointless. Inline. At one call site, its redundancy is now obvious. Delete it there. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20180926122933.3858-1-armbru@redhat.com> Reviewed-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/libqtest.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c
index 2cd5736..44ce118 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -48,10 +48,6 @@ struct QTestState
static GHookList abrt_hooks;
static struct sigaction sigact_old;
-#define g_assert_no_errno(ret) do { \
- g_assert_cmpint(ret, !=, -1); \
-} while (0)
-
static int qtest_query_target_endianness(QTestState *s);
static int init_socket(const char *socket_path)
@@ -61,7 +57,7 @@ static int init_socket(const char *socket_path)
int ret;
sock = socket(PF_UNIX, SOCK_STREAM, 0);
- g_assert_no_errno(sock);
+ g_assert_cmpint(sock, !=, -1);
addr.sun_family = AF_UNIX;
snprintf(addr.sun_path, sizeof(addr.sun_path), "%s", socket_path);
@@ -70,9 +66,9 @@ static int init_socket(const char *socket_path)
do {
ret = bind(sock, (struct sockaddr *)&addr, sizeof(addr));
} while (ret == -1 && errno == EINTR);
- g_assert_no_errno(ret);
+ g_assert_cmpint(ret, !=, -1);
ret = listen(sock, 1);
- g_assert_no_errno(ret);
+ g_assert_cmpint(ret, !=, -1);
return sock;
}
@@ -325,7 +321,6 @@ static void socket_send(int fd, const char *buf, size_t size)
continue;
}
- g_assert_no_errno(len);
g_assert_cmpint(len, >, 0);
offset += len;