XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
b5b292896f647c85f03f53b20b2f03c0e94de428
xserver/test/Makefile.am

242 lines
5.7 KiB
Makefile
Raw Normal View History

Add generalized unit test support using util-macros. A handful of modules have begun adding unit test programs. These macros will help providing a consistent interface which will help package builders and developers to manage the functionality. XORG_ENABLE_UNIT_TESTS will turn on/off unit testing, regardless of how it is implemented. The default (yes/no) can be specified by each module. It can be used by itself if glib or -wrap support is not needed. XORG_WITH_GLIB will probe the system for glib-2.0. A different version can be specified in each module. It will consult XORG_ENABLE_UNIT_TESTS but can be used by itself in contexts other then unit testing. The default (yes/no) can be specified by each module. XORG_LD_WRAP will probe the linker for -wrap support. It will consult XORG_ENABLE_UNIT_TESTS but can be used by itself in contexts other then unit testing. configure options: --enable-unit-tests Enable building unit test cases (default: auto) --with-glib Use GLib library for unit testing (default: auto) Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Keith Packard <keithp@keithp.com>
2011-03-17 19:26:36 -04:00
if ENABLE_UNIT_TESTS
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>
2011-11-28 20:38:58 -08:00
SUBDIRS= .
tests: Convert test/ to single binary Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:10 +05:00
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
AM_CPPFLAGS = $(XORG_INCS)
tests: Move test/{xi1,xi2}/tests to test/ Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:11 +05:00
tests_CPPFLAGS=
CLEANFILES=
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>
2011-11-28 20:38:58 -08:00
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
test: Only build hashtable tests if building X-Resource extension The hash table functions are only included in the server when the X-Resource extension is built, so don't try to build and test them unless the X-Resource extension is being built. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2014-09-10 15:41:08 -07:00
if RES
tests: Convert test/ to single binary Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:10 +05:00
RES_SRCS = hashtabletest.c
AM_CPPFLAGS += -DRES_TESTS
test: Only build hashtable tests if building X-Resource extension The hash table functions are only included in the server when the X-Resource extension is built, so don't try to build and test them unless the X-Resource extension is being built. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2014-09-10 15:41:08 -07:00
endif
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>
2011-11-28 20:38:58 -08:00
endif
Add a test-suite for in-server unit-testing. This patch adds a test/ directory that contains the setup for a unit-testing suite designed for in-server unit-testing. All functions available to the X server are available to the test binaries through static linking. This test suite uses the glib testing framework. Do not use glib calls outside of the test/ directory. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-15 17:21:08 +10:00
tests: Convert test/ to single binary Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:10 +05:00
noinst_PROGRAMS = simple-xinit tests
test: Add a little xinit-like program for starting servers for testing The normal xinit is racy because it doesn't use -displayfd. This implements the bare minimum for testing purposes, using -displayfd to sequence starting the client, and avoids adding yet another dependency to the server. v2: Fix asprintf error checks. v3: Add error checking for fork(), clarify calloc() arg. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2016-09-25 13:30:17 -07:00
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
if XVFB
XVFB_TESTS = scripts/xvfb-piglit.sh
test: Run xts against Xephyr -glamor when present v2: Drop x8r8g8b8 skip, now that it's fixed. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2016-09-25 13:30:22 -07:00
if XEPHYR
if GLAMOR
XEPHYR_GLAMOR_TESTS = scripts/xephyr-glamor-piglit.sh
endif
endif
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
endif
SCRIPT_TESTS = \
$(XVFB_TESTS) \
test: Run xts against Xephyr -glamor when present v2: Drop x8r8g8b8 skip, now that it's fixed. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2016-09-25 13:30:22 -07:00
$(XEPHYR_GLAMOR_TESTS) \
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
$(NULL)
tests: Convert test/ to single binary Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:10 +05:00
TESTS = tests \
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
$(SCRIPT_TESTS) \
$(NULL)
TESTS_ENVIRONMENT = \
test: Handle srcdir != builddir in Xvfb testing Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2016-09-25 13:30:16 -07:00
XSERVER_DIR=$(abs_top_srcdir) \
XSERVER_BUILDDIR=$(abs_top_builddir) \
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
$(XORG_MALLOC_DEBUG_ENV) \
$(NULL)
Add a test-suite for in-server unit-testing. This patch adds a test/ directory that contains the setup for a unit-testing suite designed for in-server unit-testing. All functions available to the X server are available to the test binaries through static linking. This test suite uses the glib testing framework. Do not use glib calls outside of the test/ directory. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-15 17:21:08 +10:00
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>
2011-11-28 20:38:58 -08:00
if XORG
tests: Move test/{xi1,xi2}/tests to test/ Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:11 +05:00
AM_CPPFLAGS += \
-I$(srcdir)/xi1 \
-I$(srcdir)/xi2 \
-I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/parser \
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>
2011-11-28 20:38:58 -08:00
-I$(top_srcdir)/hw/xfree86/ddc \
xfree86: Move sdksyms generation to ddx toplevel The symbols in sdksyms.c cover the entire source tree. In order to make them resolve when libxorg.la goes away, move the objects from libloader to Xorg. Unfortunately, this means sdksyms needs to get built again for the test code. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> Tested-by: Jamey Sharp <jamey@minilop.net> Reviewed-by: Daniel Stone <daniel@fooishbar.org> Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-06-14 19:47:02 -07:00
-I$(top_srcdir)/hw/xfree86/i2c -I$(top_srcdir)/hw/xfree86/modes \
Move DRI2 from external module to built-in Instead of keeping a tiny amount of code in an external module, just man up and build it into the core server. v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2012-07-10 02:03:18 +01:00
-I$(top_srcdir)/hw/xfree86/ramdac -I$(top_srcdir)/hw/xfree86/dri \
dri3: Add DRI3 extension Adds DRM compatible fences using futexes. Uses FD passing to get pixmaps from DRM applications. Signed-off-by: Keith Packard <keithp@keithp.com> Reviewed-by: Adam Jackson <ajax@redhat.com>
2013-04-09 19:59:39 -07:00
-I$(top_srcdir)/hw/xfree86/dri2 -I$(top_srcdir)/dri3
tests: Move test/{xi1,xi2}/tests to test/ Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:11 +05:00
tests_CPPFLAGS += $(AM_CPPFLAGS)
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>
2011-11-28 20:38:58 -08:00
endif
tests: Move test/{xi1,xi2}/tests to test/ Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:11 +05:00
tests_LDFLAGS = \
-Wl,-wrap,dixLookupWindow \
-Wl,-wrap,dixLookupClient \
-Wl,-wrap,WriteToClient \
-Wl,-wrap,dixLookupWindow \
-Wl,-wrap,XISetEventMask \
-Wl,-wrap,AddResource \
-Wl,-wrap,GrabButton \
$()
tests: shuffle around the linking order to please GNU ld Classic GNU ld resolves symbol dependencies only forward, while GOLD seems to work regardless of the specified library order. Suggested-by: Eero Tamminen <eero.t.tamminen@intel.com> Reviewed-by: Mihail Konev <k.mvc@ya.ru> Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
2017-01-25 17:29:15 +02:00
tests_LDADD =
Revert "tests: fix --disable-xorg build" Pushed the wrong thing. This reverts commit 730fd8c05f56da21894691bbd2e7ff37f67b45f4.
2017-01-16 14:59:40 -05:00
tests_SOURCES = \
tests-common.c \
fixes.c \
input.c \
list.c \
misc.c \
signal-logging.c \
string.c \
touch.c \
xfree86.c \
test_xkb.c \
xtest.c \
$(RES_SRCS) \
tests.c
if HAVE_LD_WRAP
tests: Move test/{xi1,xi2}/tests to test/ Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:11 +05:00
tests_CPPFLAGS += -DLDWRAP_TESTS
Revert "tests: fix --disable-xorg build" Pushed the wrong thing. This reverts commit 730fd8c05f56da21894691bbd2e7ff37f67b45f4.
2017-01-16 14:59:40 -05:00
tests: Move test/{xi1,xi2}/tests to test/ Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:11 +05:00
tests_SOURCES += \
xi1/protocol-xchangedevicecontrol.c \
xi2/protocol-common.c \
xi2/protocol-xiqueryversion.c \
xi2/protocol-xiquerydevice.c \
xi2/protocol-xiselectevents.c \
xi2/protocol-xigetselectedevents.c \
xi2/protocol-xisetclientpointer.c \
xi2/protocol-xigetclientpointer.c \
xi2/protocol-xiquerypointer.c \
xi2/protocol-xipassivegrabdevice.c \
xi2/protocol-xiwarppointer.c \
xi2/protocol-eventconvert.c \
xi2/xi2.c
else !HAVE_LD_WRAP
# Print that xi1-tests were skipped (exit code 77 for automake test harness)
TESTS += xi1-tests
CLEANFILES += xi1-tests
xi1-tests:
@echo 'echo "ld -wrap support required for xi1 unit tests, skipping"' > $@
@echo 'exit 77' >> $@
$(AM_V_GEN)chmod +x $@
# Print that xi2-tests were skipped (exit code 77 for automake test harness)
TESTS += xi2-tests
CLEANFILES += xi2-tests
xi2-tests:
@echo 'echo "ld -wrap support required for xi2 unit tests, skipping"' > $@
@echo 'exit 77' >> $@
$(AM_V_GEN)chmod +x $@
endif !HAVE_LD_WRAP
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
tests_LDADD += $(XSERVER_LIBS)
Revert "tests: fix --disable-xorg build" Pushed the wrong thing. This reverts commit 730fd8c05f56da21894691bbd2e7ff37f67b45f4.
2017-01-16 14:59:40 -05:00
if XORG
Move DRI1 from external module to built-in Rather than building the tiny amount of code required for XFree86-DRI as an external module, build it in if it's enabled at configure time. v2: Fix test/Makefile.am to only link libdri.la if DRI is set Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> fixup for DRI1 move Signed-off-by: Keith Packard <keithp@keithp.com>
2012-07-10 02:03:15 +01:00
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
nodist_tests_SOURCES = sdksyms.c
tests_LDADD += \
Add a test-suite for in-server unit-testing. This patch adds a test/ directory that contains the setup for a unit-testing suite designed for in-server unit-testing. All functions available to the X server are available to the test binaries through static linking. This test suite uses the glib testing framework. Do not use glib calls outside of the test/ directory. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-15 17:21:08 +10:00
$(top_builddir)/hw/xfree86/loader/libloader.la \
$(top_builddir)/hw/xfree86/common/libcommon.la \
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
$(top_builddir)/hw/xfree86/os-support/libxorgos.la \
libxf86config: libxf86config_internal -> libxf86config Now since the installable libxf86config is gone, rename libxf86config_internal to libxf86config. Signed-off-by: Egbert Eich <eich@freedesktop.org> Reviewed-by: Keith Packard <keithp@keithp.com>
2014-02-07 16:21:48 +01:00
$(top_builddir)/hw/xfree86/parser/libxf86config.la \
Add a test-suite for in-server unit-testing. This patch adds a test/ directory that contains the setup for a unit-testing suite designed for in-server unit-testing. All functions available to the X server are available to the test binaries through static linking. This test suite uses the glib testing framework. Do not use glib calls outside of the test/ directory. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-15 17:21:08 +10:00
$(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
$(top_builddir)/hw/xfree86/modes/libxf86modes.la \
$(top_builddir)/hw/xfree86/ramdac/libramdac.la \
$(top_builddir)/hw/xfree86/ddc/libddc.la \
$(top_builddir)/hw/xfree86/i2c/libi2c.la \
test: Fix linking issues when building unit tests without the Xorg DDX This allows unit tests to build and run successfully on darwin when only the Xvfb or XQuartz DDX is built. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2012-01-11 12:17:06 -08:00
$(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
vidmode: move to a separate library of its own XVidMode extension might be useful to non hardware servers as well (e.g. Xwayand) so that applications that rely on it (e.g. lot of older games) can at least have read access to XVidMode. But the implementation is very XFree86 centric, so the idea is to add a bunch of vfunc that other non-XFree86 servers can hook up into to provide a similar functionality. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=87806 Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
2016-02-10 09:34:34 +01:00
$(top_builddir)/Xext/libXvidmode.la \
test: Fix linking issues when building unit tests without the Xorg DDX This allows unit tests to build and run successfully on darwin when only the Xvfb or XQuartz DDX is built. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
2012-01-11 12:17:06 -08:00
@XORG_LIBS@
test: Fix 'make dist' for configurations that build the Xorg DDX Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-03-05 00:05:48 -08:00
tests: Fix without-dtrace build Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Reviewed-by: Mihail Konev <k.mvc@ya.ru> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-13 18:44:01 +01:00
if !SPECIAL_DTRACE_OBJECTS
tests_LDADD += $(top_builddir)/os/libos.la
endif
test: create a link to the generated hw/xfree86/sdksyms.c at build time Automake 1.14 gives us warning about source code specified in _SOURCES that comes from directories other than the current one. It suggests to enable the subdir-objects feature which only supports code in sub directories. The test directory needs source from hw/xfree86 which is neither under test nor under a sub directory of test. In 1.14 we get a warning, in 2.0 it will break as it will overwrite the object code in xfree86. The solution in this case is to create a link to hw/xfree86/sdksyms.c at build time. It's just like any other built source file. There are no links created in git. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2014-04-04 14:59:21 -04:00
BUILT_SOURCES = sdksyms.c
tests: Move test/{xi1,xi2}/tests to test/ Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:11 +05:00
CLEANFILES += sdksyms.c
test: create a link to the generated hw/xfree86/sdksyms.c at build time Automake 1.14 gives us warning about source code specified in _SOURCES that comes from directories other than the current one. It suggests to enable the subdir-objects feature which only supports code in sub directories. The test directory needs source from hw/xfree86 which is neither under test nor under a sub directory of test. In 1.14 we get a warning, in 2.0 it will break as it will overwrite the object code in xfree86. The solution in this case is to create a link to hw/xfree86/sdksyms.c at build time. It's just like any other built source file. There are no links created in git. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
2014-04-04 14:59:21 -04:00
sdksyms.c: $(top_builddir)/hw/xfree86/sdksyms.c
$(AM_V_GEN)$(LN_S) $(top_builddir)/hw/xfree86/sdksyms.c
Move DRI1 from external module to built-in Rather than building the tiny amount of code required for XFree86-DRI as an external module, build it in if it's enabled at configure time. v2: Fix test/Makefile.am to only link libdri.la if DRI is set Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> fixup for DRI1 move Signed-off-by: Keith Packard <keithp@keithp.com>
2012-07-10 02:03:15 +01:00
if DRI
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
tests_LDADD += $(top_builddir)/hw/xfree86/dri/libdri.la
Move DRI1 from external module to built-in Rather than building the tiny amount of code required for XFree86-DRI as an external module, build it in if it's enabled at configure time. v2: Fix test/Makefile.am to only link libdri.la if DRI is set Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Keith Packard <keithp@keithp.com> fixup for DRI1 move Signed-off-by: Keith Packard <keithp@keithp.com>
2012-07-10 02:03:15 +01:00
endif
Move DRI2 from external module to built-in Instead of keeping a tiny amount of code in an external module, just man up and build it into the core server. v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2012-07-10 02:03:18 +01:00
if DRI2
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
tests_LDADD += $(top_builddir)/hw/xfree86/dri2/libdri2.la
Move DRI2 from external module to built-in Instead of keeping a tiny amount of code in an external module, just man up and build it into the core server. v2: Fix test/Makefile.am to only link libdri2.la if DRI2 is set Signed-off-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Jamey Sharp <jamey@minilop.net> Signed-off-by: Keith Packard <keithp@keithp.com>
2012-07-10 02:03:18 +01:00
endif
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
if DRI3
tests_LDADD += $(top_builddir)/dri3/libdri3.la
endif
Revert "tests: fix --disable-xorg build" Pushed the wrong thing. This reverts commit 730fd8c05f56da21894691bbd2e7ff37f67b45f4.
2017-01-16 14:59:40 -05:00
else !XORG
nodist_tests_SOURCES = \
ddxstubs.c \
$(top_srcdir)/mi/miinitext.c
tests_LDADD += \
$(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)/Xext/libXextdpmsstubs.la \
$(top_builddir)/Xext/libXvidmode.la \
$(top_builddir)/Xi/libXi.la \
$(top_builddir)/Xi/libXistubs.la \
$(top_builddir)/xfixes/libxfixes.la \
$(top_builddir)/xkb/libxkb.la \
$(top_builddir)/xkb/libxkbstubs.la
if COMPOSITE
tests_LDADD += \
$(top_builddir)/composite/libcomposite.la
endif
if DBE
tests_LDADD += \
$(top_builddir)/dbe/libdbe.la
endif
if GLX
tests_LDADD += \
$(top_builddir)/glx/libglx.la
endif
if RECORD
tests_LDADD += \
$(top_builddir)/record/librecord.la
endif
if DRI3
tests_LDADD += \
$(top_builddir)/dri3/libdri3.la
endif
if XQUARTZ
tests_LDADD += \
$(top_builddir)/miext/rootless/librootless.la
tests_LDADD += -lXplugin
endif
if XWIN_MULTIWINDOWEXTWM
tests_LDADD += \
$(top_builddir)/miext/rootless/librootless.la
endif
endif !XORG
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
tests: shuffle around the linking order to please GNU ld Classic GNU ld resolves symbol dependencies only forward, while GOLD seems to work regardless of the specified library order. Suggested-by: Eero Tamminen <eero.t.tamminen@intel.com> Reviewed-by: Mihail Konev <k.mvc@ya.ru> Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
2017-01-25 17:29:15 +02:00
# GNU LD scans only in one direction, add the following dependencies at the end
# so as they get picked up by the previously-linked libraries
tests_LDADD += $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLX_SYS_LIBS)
tests: Remove obsolete libxservertest.la Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-12 13:21:12 +05:00
endif ENABLE_UNIT_TESTS
test: Fix make dist It seems like make dist should be doing te right thing without this commit, but it's not in some cases. Don't ask me to explain why. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-04-07 15:26:53 -07:00
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
EXTRA_DIST = \
test: fix distributing scripts Fix the following error on 'make distcheck': make[6]: *** No rule to make target 'scripts/xvfb-piglit.sh', needed by 'scripts/xvfb-piglit.sh.log'. Stop. make[6]: Leaving directory '/home/pq/git/xserver/xorg-server-1.19.99.1/_build/sub/test' Makefile:1367: recipe for target 'check-TESTS' failed The setup to trigger this is: $ ./configure --prefix=/home/pq/local --disable-docs --disable-devel-docs --enable-xwayland --disable-xorg --disable-xvfb --disable-xnest --disable-xquartz --disable-xwin --enable-debug SCRIPT_TESTS is populated conditionally, but we should distribute the scripts in any case. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-12-07 15:43:06 +02:00
scripts/xvfb-piglit.sh \
scripts/xephyr-glamor-piglit.sh \
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
scripts/xinit-piglit-session.sh \
test: Make the piglit-running script callable with an arbitrary server v2: Check that SERVER_COMMAND is set. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Eric Anholt <eric@anholt.net>
2016-09-25 13:30:18 -07:00
scripts/run-piglit.sh \
test: Run some XTS5 integration tests against Xvfb if possible. By default the tests will be skipped. However, if you set XTEST_DIR to the repo of a built X Test Suite and PIGLIT_DIR to a piglit repo (no build necessary), make check will run piglit's xts-render tests against Xvfb. We could run more of XTS5, but I haven't spent the time identifying what additional subset would be worth running, since much of it is only really testing the client libraries. We want to make sure that we keep the runtime down, and this subset of the test suite took 92 seconds according to piglit. Reviewed-by: Adam Jackson <ajax@redhat.com>
2016-08-31 17:00:00 -07:00
ddxstubs.c \
$(NULL)
test: Fix make dist It seems like make dist should be doing te right thing without this commit, but it's not in some cases. Don't ask me to explain why. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2012-04-07 15:26:53 -07:00
Reference in New Issue Copy Permalink