summaryrefslogtreecommitdiff
path: root/test/xi2/protocol-common.h
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-04-15 14:51:06 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-04-21 13:43:43 +1000
commit196d679bed2e9959d2fca89d4ee4bbc551681d0b (patch)
treeabcabc5615512cc1824de33ce090d658603b45ea /test/xi2/protocol-common.h
parent071a6ac4d0c347aa7fc6efe37f4f6992524d7ef1 (diff)
test: remove glib dependency
The few features from the glib test suite we used can be replaced with assert and printf. This patch is a simple replacement for these two g_assert → assert g_test_message → printf g_test_init is removed and so is g_test_bug_base. g_test_run replaced with a simple return 0. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com> Acked-by: Gaetan Nadon <memsize@videotron.ca>
Diffstat (limited to 'test/xi2/protocol-common.h')
-rw-r--r--test/xi2/protocol-common.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
index afa08780c..18c61e62a 100644
--- a/test/xi2/protocol-common.h
+++ b/test/xi2/protocol-common.h
@@ -29,6 +29,7 @@
#include "windowstr.h"
#include "scrnintstr.h"
#include "exevents.h"
+#include <assert.h>
#ifndef PROTOCOL_COMMON_H
#define PROTOCOL_COMMON_H
@@ -38,11 +39,11 @@ extern int BadDevice;
/* Check default values in a reply */
#define reply_check_defaults(rep, len, type) \
{ \
- g_assert((len) >= sz_x##type##Reply); \
- g_assert((rep)->repType == X_Reply); \
- g_assert((rep)->RepType == X_##type); \
- g_assert((rep)->sequenceNumber == CLIENT_SEQUENCE); \
- g_assert((rep)->length >= (sz_x##type##Reply - 32)/4); \
+ assert((len) >= sz_x##type##Reply); \
+ assert((rep)->repType == X_Reply); \
+ assert((rep)->RepType == X_##type); \
+ assert((rep)->sequenceNumber == CLIENT_SEQUENCE); \
+ assert((rep)->length >= (sz_x##type##Reply - 32)/4); \
}
/* initialise default values for request */