Revert "test: check from INT_MIN to INT_MAX for core type conversion"
This patch requires extra special casing to check if the linker supports the
-wrap option. Patches to do so will follow, in the meantime, revert this
commit. It shouldn't have been pushed in the first place anyway.
This reverts commit d979f44394
.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
d770d57f17
commit
7f3456a408
|
@ -10,7 +10,6 @@ TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
|
||||||
|
|
||||||
xkb_LDADD=$(TEST_LDADD)
|
xkb_LDADD=$(TEST_LDADD)
|
||||||
input_LDADD=$(TEST_LDADD)
|
input_LDADD=$(TEST_LDADD)
|
||||||
input_CFLAGS=$(AM_CFLAGS) -Wl,-wrap,ErrorF
|
|
||||||
|
|
||||||
libxservertest_la_LIBADD = \
|
libxservertest_la_LIBADD = \
|
||||||
$(XSERVER_LIBS) \
|
$(XSERVER_LIBS) \
|
||||||
|
|
52
test/input.c
52
test/input.c
|
@ -40,10 +40,6 @@
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
void __wrap_ErrorF(const char *f, ...)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Init a device with axes.
|
* Init a device with axes.
|
||||||
* Verify values set on the device.
|
* Verify values set on the device.
|
||||||
|
@ -258,36 +254,36 @@ static void dix_event_to_core_conversion(void)
|
||||||
{
|
{
|
||||||
DeviceEvent ev;
|
DeviceEvent ev;
|
||||||
xEvent core;
|
xEvent core;
|
||||||
int rc, i;
|
int rc;
|
||||||
|
|
||||||
ev.header = 0xFF;
|
ev.header = 0xFF;
|
||||||
ev.length = sizeof(DeviceEvent);
|
ev.length = sizeof(DeviceEvent);
|
||||||
|
|
||||||
for (i = INT_MIN; i < INT_MAX; i++)
|
ev.type = 0;
|
||||||
{
|
|
||||||
switch(i)
|
|
||||||
{
|
|
||||||
case ET_KeyPress:
|
|
||||||
case ET_KeyRelease:
|
|
||||||
case ET_ButtonPress:
|
|
||||||
case ET_ButtonRelease:
|
|
||||||
case ET_Motion:
|
|
||||||
dix_event_to_core(i);
|
|
||||||
break;
|
|
||||||
case ET_Raw:
|
|
||||||
case ET_ProximityIn:
|
|
||||||
case ET_ProximityOut:
|
|
||||||
ev.type = i;
|
|
||||||
rc = EventToCore((InternalEvent*)&ev, &core);
|
|
||||||
g_assert(rc == BadMatch);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
ev.type = i;
|
|
||||||
rc = EventToCore((InternalEvent*)&ev, &core);
|
rc = EventToCore((InternalEvent*)&ev, &core);
|
||||||
g_assert(rc == BadImplementation);
|
g_assert(rc == BadImplementation);
|
||||||
break;
|
|
||||||
}
|
ev.type = 1;
|
||||||
}
|
rc = EventToCore((InternalEvent*)&ev, &core);
|
||||||
|
g_assert(rc == BadImplementation);
|
||||||
|
|
||||||
|
ev.type = ET_ProximityOut + 1;
|
||||||
|
rc = EventToCore((InternalEvent*)&ev, &core);
|
||||||
|
g_assert(rc == BadImplementation);
|
||||||
|
|
||||||
|
ev.type = ET_ProximityIn;
|
||||||
|
rc = EventToCore((InternalEvent*)&ev, &core);
|
||||||
|
g_assert(rc == BadMatch);
|
||||||
|
|
||||||
|
ev.type = ET_ProximityOut;
|
||||||
|
rc = EventToCore((InternalEvent*)&ev, &core);
|
||||||
|
g_assert(rc == BadMatch);
|
||||||
|
|
||||||
|
dix_event_to_core(ET_KeyPress);
|
||||||
|
dix_event_to_core(ET_KeyRelease);
|
||||||
|
dix_event_to_core(ET_ButtonPress);
|
||||||
|
dix_event_to_core(ET_ButtonRelease);
|
||||||
|
dix_event_to_core(ET_Motion);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xi2_struct_sizes(void)
|
static void xi2_struct_sizes(void)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user