diff options
author | marha <marha@users.sourceforge.net> | 2012-01-17 09:07:57 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-01-17 09:07:57 +0100 |
commit | 05accdf525b82a20be8e92789185d8537bc4ab81 (patch) | |
tree | 05bc88963d29df95f0a7c63cad7ce773e093b632 /xorg-server/test | |
parent | 3e85e2f1e33380d6c9efe0972ed475cbf9dbe825 (diff) | |
parent | 34c1e86406451a3604de4982339058088434ab40 (diff) | |
download | vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.gz vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.tar.bz2 vcxsrv-05accdf525b82a20be8e92789185d8537bc4ab81.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/test')
-rw-r--r-- | xorg-server/test/Makefile.am | 57 | ||||
-rw-r--r-- | xorg-server/test/ddxstubs.c | 91 |
2 files changed, 144 insertions, 4 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index ba8932c5d..b875b75f7 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -50,11 +50,60 @@ libxservertest_la_LIBADD += \ $(top_builddir)/hw/xfree86/ramdac/libramdac.la \ $(top_builddir)/hw/xfree86/ddc/libddc.la \ $(top_builddir)/hw/xfree86/i2c/libi2c.la \ - $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la + $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ + @XORG_LIBS@ +else +nodist_libxservertest_la_SOURCES = \ + ddxstubs.c \ + $(top_srcdir)/mi/miinitext.c \ + $(top_srcdir)/Xext/dpmsstubs.c \ + $(top_srcdir)/Xi/stubs.c + +libxservertest_la_LIBADD += \ + $(top_builddir)/damageext/libdamageext.la \ + $(top_builddir)/fb/libfb.la \ + $(top_builddir)/fb/libwfb.la \ + $(top_builddir)/miext/damage/libdamage.la \ + $(top_builddir)/miext/sync/libsync.la \ + $(top_builddir)/randr/librandr.la \ + $(top_builddir)/render/librender.la \ + $(top_builddir)/Xext/libXext.la \ + $(top_builddir)/Xi/libXi.la \ + $(top_builddir)/xfixes/libxfixes.la \ + $(top_builddir)/xkb/libxkb.la \ + $(top_builddir)/xkb/libxkbstubs.la + +if COMPOSITE +libxservertest_la_LIBADD += \ + $(top_builddir)/composite/libcomposite.la endif + +if DBE libxservertest_la_LIBADD += \ - $(top_builddir)/mi/libmi.la \ - $(top_builddir)/os/libos.la \ - @XORG_LIBS@ + $(top_builddir)/dbe/libdbe.la +endif + +if GLX +libxservertest_la_LIBADD += \ + $(top_builddir)/glx/libglx.la +endif + +if RECORD +libxservertest_la_LIBADD += \ + $(top_builddir)/record/librecord.la +endif + +if XQUARTZ +libxservertest_la_LIBADD += \ + $(top_builddir)/miext/rootless/librootless.la +TEST_LDADD += -lXplugin +endif + +if XWIN_MULTIWINDOWEXTWM +libxservertest_la_LIBADD += \ + $(top_builddir)/miext/rootless/librootless.la +endif +endif + libxservertest_la_DEPENDENCIES = $(libxservertest_la_LIBADD) endif diff --git a/xorg-server/test/ddxstubs.c b/xorg-server/test/ddxstubs.c new file mode 100644 index 000000000..baf2a7a50 --- /dev/null +++ b/xorg-server/test/ddxstubs.c @@ -0,0 +1,91 @@ +/** + * Copyright © 2012 Apple Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/* This file contains stubs for some symbols which are usually provided by a + * DDX. These stubs should allow the unit tests to build on platforms with + * stricter linkers (eg: darwin) when the Xorg DDX is not built. + */ + +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> +#endif + +#include "input.h" +#include "mi.h" + +void DDXRingBell(int volume, int pitch, int duration) { +} + +void ProcessInputEvents(void) { + mieqProcessInputEvents(); +} + +void OsVendorInit(void) { +} + +void OsVendorFatalError(void) { +} + +void AbortDDX(enum ExitCode error) { + OsAbort(); +} + +void ddxUseMsg(void) { +} + +int ddxProcessArgument(int argc, char *argv[], int i) { + return 0; +} + +void ddxGiveUp( enum ExitCode error ) { +} + +Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) { + return TRUE; +} + +#ifdef XQUARTZ +#include <pthread.h> + +BOOL serverRunning = TRUE; +pthread_mutex_t serverRunningMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t serverRunningCond = PTHREAD_COND_INITIALIZER; + +int darwinMainScreenX = 0; +int darwinMainScreenY = 0; + +BOOL no_configure_window = FALSE; + +void darwinEvents_lock(void) { +} + +void darwinEvents_unlock(void) { +} +#endif + +#ifdef DDXBEFORERESET +void +ddxBeforeReset(void) { +} +#endif + |