hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-09 23:22:22 +00:00
Code Issues Projects Releases Wiki Activity

test: remove glib dependency

Browse source 
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>
This commit is contained in:
Peter Hutterer 2011-04-15 14:51:06 +10:00
commit 196d679bed
19 changed files with 580 additions and 642 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/xi2/protocol-xiwarppointer.c
View file

@ -39,7 +39,6 @@
#include "exevents.h"
#include "protocol-common.h"
#include <glib.h>
static int expected_x = SPRITE_X;
static int expected_y = SPRITE_Y;
@ -70,8 +69,8 @@ int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access
static Bool ScreenSetCursorPosition(DeviceIntPtr dev, ScreenPtr screen,
int x, int y, Bool generateEvent)
{
g_assert(x == expected_x);
g_assert(y == expected_y);
assert(x == expected_x);
assert(y == expected_y);
return TRUE;
}
@ -83,12 +82,12 @@ static void request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq* req,
int rc;
rc = ProcXIWarpPointer(client);
g_assert(rc == error);
assert(rc == error);
if (rc == BadDevice)
g_assert(client->errorValue == req->deviceid);
assert(client->errorValue == req->deviceid);
else if (rc == BadWindow)
g_assert(client->errorValue == req->dst_win ||
assert(client->errorValue == req->dst_win ||
client->errorValue == req->src_win);
@ -105,12 +104,12 @@ static void request_XIWarpPointer(ClientPtr client, xXIWarpPointerReq* req,
swaps(&req->deviceid, n);
rc = SProcXIWarpPointer(client);
g_assert(rc == error);
assert(rc == error);
if (rc == BadDevice)
g_assert(client->errorValue == req->deviceid);
assert(client->errorValue == req->deviceid);
else if (rc == BadWindow)
g_assert(client->errorValue == req->dst_win ||
assert(client->errorValue == req->dst_win ||
client->errorValue == req->src_win);
client->swapped = FALSE;
@ -204,13 +203,10 @@ static void test_XIWarpPointer(void)
int main(int argc, char** argv)
{
g_test_init(&argc, &argv,NULL);
g_test_bug_base("https://bugzilla.freedesktop.org/show_bug.cgi?id=");
init_simple();
screen.SetCursorPosition = ScreenSetCursorPosition;
g_test_add_func("/xi2/protocol/XIWarpPointer", test_XIWarpPointer);
test_XIWarpPointer();
return g_test_run();
return 0;
}