Disable building of tests requiring DDX functions when Xorg is not built
Some test cases require linking with some sort of DDX - ideally we'd have a stub ddx for testing, but for now, since we link with the Xorg ddx, disable those tests when configured with --disable-xorg Fixes https://bugs.freedesktop.org/show_bug.cgi?id=43320 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
feebf67463
commit
84207def93
|
@ -1,21 +1,32 @@
|
||||||
if ENABLE_UNIT_TESTS
|
if ENABLE_UNIT_TESTS
|
||||||
SUBDIRS= . xi2
|
SUBDIRS= .
|
||||||
noinst_PROGRAMS = xkb input xtest list misc fixes xfree86 string
|
noinst_PROGRAMS = list string
|
||||||
|
if XORG
|
||||||
|
# Tests that require at least some DDX functions in order to fully link
|
||||||
|
# For now, requires xf86 ddx, could be adjusted to use another
|
||||||
|
SUBDIRS += xi2
|
||||||
|
noinst_PROGRAMS += xkb input xtest misc fixes xfree86
|
||||||
|
endif
|
||||||
check_LTLIBRARIES = libxservertest.la
|
check_LTLIBRARIES = libxservertest.la
|
||||||
|
|
||||||
TESTS=$(noinst_PROGRAMS)
|
TESTS=$(noinst_PROGRAMS)
|
||||||
TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
|
TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV)
|
||||||
|
|
||||||
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
||||||
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser \
|
INCLUDES = $(XORG_INCS) -I$(top_srcdir)/miext/cw
|
||||||
-I$(top_srcdir)/miext/cw -I$(top_srcdir)/hw/xfree86/ddc \
|
if XORG
|
||||||
|
INCLUDES += -I$(top_srcdir)/hw/xfree86/parser \
|
||||||
|
-I$(top_srcdir)/hw/xfree86/ddc \
|
||||||
-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
|
-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
|
||||||
-I$(top_srcdir)/hw/xfree86/ramdac
|
-I$(top_srcdir)/hw/xfree86/ramdac
|
||||||
|
endif
|
||||||
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS)
|
||||||
|
|
||||||
|
if XORG
|
||||||
if SPECIAL_DTRACE_OBJECTS
|
if SPECIAL_DTRACE_OBJECTS
|
||||||
TEST_LDADD += $(OS_LIB) $(DIX_LIB)
|
TEST_LDADD += $(OS_LIB) $(DIX_LIB)
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
xkb_LDADD=$(TEST_LDADD)
|
xkb_LDADD=$(TEST_LDADD)
|
||||||
input_LDADD=$(TEST_LDADD)
|
input_LDADD=$(TEST_LDADD)
|
||||||
|
@ -25,9 +36,10 @@ misc_LDADD=$(TEST_LDADD)
|
||||||
fixes_LDADD=$(TEST_LDADD)
|
fixes_LDADD=$(TEST_LDADD)
|
||||||
xfree86_LDADD=$(TEST_LDADD)
|
xfree86_LDADD=$(TEST_LDADD)
|
||||||
|
|
||||||
|
libxservertest_la_LIBADD = $(XSERVER_LIBS)
|
||||||
|
if XORG
|
||||||
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
|
nodist_libxservertest_la_SOURCES = $(top_builddir)/hw/xfree86/sdksyms.c
|
||||||
libxservertest_la_LIBADD = \
|
libxservertest_la_LIBADD += \
|
||||||
$(XSERVER_LIBS) \
|
|
||||||
$(top_builddir)/hw/xfree86/loader/libloader.la \
|
$(top_builddir)/hw/xfree86/loader/libloader.la \
|
||||||
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
|
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
|
||||||
$(top_builddir)/hw/xfree86/common/libcommon.la \
|
$(top_builddir)/hw/xfree86/common/libcommon.la \
|
||||||
|
@ -37,7 +49,9 @@ libxservertest_la_LIBADD = \
|
||||||
$(top_builddir)/hw/xfree86/ramdac/libramdac.la \
|
$(top_builddir)/hw/xfree86/ramdac/libramdac.la \
|
||||||
$(top_builddir)/hw/xfree86/ddc/libddc.la \
|
$(top_builddir)/hw/xfree86/ddc/libddc.la \
|
||||||
$(top_builddir)/hw/xfree86/i2c/libi2c.la \
|
$(top_builddir)/hw/xfree86/i2c/libi2c.la \
|
||||||
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
|
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la
|
||||||
|
endif
|
||||||
|
libxservertest_la_LIBADD += \
|
||||||
$(top_builddir)/mi/libmi.la \
|
$(top_builddir)/mi/libmi.la \
|
||||||
$(top_builddir)/os/libos.la \
|
$(top_builddir)/os/libos.la \
|
||||||
@XORG_LIBS@
|
@XORG_LIBS@
|
||||||
|
|
Loading…
Reference in New Issue
Block a user