qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org,
	"Michael Roth" <mdroth@linux.vnet.ibm.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH 06/12] glib-compat: add 2.38/2.40/2.46 asserts
Date: Wed, 14 Oct 2015 15:07:59 -0500	[thread overview]
Message-ID: <1444853285-10643-7-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1444853285-10643-1-git-send-email-mdroth@linux.vnet.ibm.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

Those are mostly useful for writing tests.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Claudio Fontana <claudio.fontana@huawei.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 include/glib-compat.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)

diff --git a/include/glib-compat.h b/include/glib-compat.h
index 318e000..fb25f43 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -165,4 +165,65 @@ static inline GThread *g_thread_new(const char *name,
 #define CompatGCond GCond
 #endif /* glib 2.31 */
 
+#ifndef g_assert_true
+#define g_assert_true(expr)                                                    \
+    do {                                                                       \
+        if (G_LIKELY(expr)) {                                                  \
+        } else {                                                               \
+            g_assertion_message(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC,   \
+                                "'" #expr "' should be TRUE");                 \
+        }                                                                      \
+    } while (0)
+#endif
+
+#ifndef g_assert_false
+#define g_assert_false(expr)                                                   \
+    do {                                                                       \
+        if (G_LIKELY(!(expr))) {                                               \
+        } else {                                                               \
+            g_assertion_message(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC,   \
+                                "'" #expr "' should be FALSE");                \
+        }                                                                      \
+    } while (0)
+#endif
+
+#ifndef g_assert_null
+#define g_assert_null(expr)                                                    \
+    do {                                                                       \
+        if (G_LIKELY((expr) == NULL)) {                                        \
+        } else {                                                               \
+            g_assertion_message(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC,   \
+                                "'" #expr "' should be NULL");                 \
+        }                                                                      \
+    } while (0)
+#endif
+
+#ifndef g_assert_nonnull
+#define g_assert_nonnull(expr)                                                 \
+    do {                                                                       \
+        if (G_LIKELY((expr) != NULL)) {                                        \
+        } else {                                                               \
+            g_assertion_message(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC,   \
+                                "'" #expr "' should not be NULL");             \
+        }                                                                      \
+    } while (0)
+#endif
+
+#ifndef g_assert_cmpmem
+#define g_assert_cmpmem(m1, l1, m2, l2)                                        \
+    do {                                                                       \
+        gconstpointer __m1 = m1, __m2 = m2;                                    \
+        int __l1 = l1, __l2 = l2;                                              \
+        if (__l1 != __l2) {                                                    \
+            g_assertion_message_cmpnum(                                        \
+                G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC,                   \
+                #l1 " (len(" #m1 ")) == " #l2 " (len(" #m2 "))", __l1, "==",   \
+                __l2, 'i');                                                    \
+        } else if (memcmp(__m1, __m2, __l1) != 0) {                            \
+            g_assertion_message(G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC,   \
+                                "assertion failed (" #m1 " == " #m2 ")");      \
+        }                                                                      \
+    } while (0)
+#endif
+
 #endif
-- 
1.9.1

  parent reply	other threads:[~2015-10-14 20:08 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-14 20:07 [Qemu-devel] [PULL 00/12] qemu-ga patch queue Michael Roth
2015-10-14 20:07 ` [Qemu-devel] [PATCH 01/12] build: qemu-ga: add 'qemu-ga' build target for w32 Michael Roth
2015-10-14 20:07 ` [Qemu-devel] [PATCH 02/12] qga: Use g_new() & friends where that makes obvious sense Michael Roth
2015-10-14 20:07 ` [Qemu-devel] [PATCH 03/12] qga: add QGA_CONF environment variable Michael Roth
2015-10-14 20:07 ` [Qemu-devel] [PATCH 04/12] qga: do not override configuration verbosity Michael Roth
2015-10-14 20:07 ` [Qemu-devel] [PATCH 05/12] qtest: add a few fd-level qmp helpers Michael Roth
2015-10-14 20:07 ` Michael Roth [this message]
2015-10-14 20:08 ` [Qemu-devel] [PATCH 07/12] tests: add a local test for guest agent Michael Roth
2015-10-14 20:08 ` [Qemu-devel] [PATCH 08/12] qga: drop guest_file_init helper and replace it with static initializers Michael Roth
2015-10-14 20:08 ` [Qemu-devel] [PATCH 09/12] qga: guest exec functionality Michael Roth
2015-10-14 22:38   ` Eric Blake
2015-10-15  3:48     ` Michael Roth
2015-10-14 20:08 ` [Qemu-devel] [PATCH 10/12] qga: handle possible SIGPIPE in guest-file-write Michael Roth
2015-10-14 20:08 ` [Qemu-devel] [PATCH 11/12] qga: handle G_IO_STATUS_AGAIN in ga_channel_write_all() Michael Roth
2015-10-14 20:08 ` [Qemu-devel] [PATCH 12/12] qga: guest-exec simple stdin/stdout/stderr redirection Michael Roth
  -- strict thread matches above, loose matches on Subject: below --
2015-10-15 16:05 [Qemu-devel] [PULL v2 00/12] qemu-ga patch queue Michael Roth
2015-10-15 16:05 ` [Qemu-devel] [PATCH 06/12] glib-compat: add 2.38/2.40/2.46 asserts Michael Roth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444853285-10643-7-git-send-email-mdroth@linux.vnet.ibm.com \
    --to=mdroth@linux.vnet.ibm.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).