AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
3d1c6c6f68
wayland/Makefile.am

343 lines
9.8 KiB
Makefile
Raw Normal View History

configure: Make documentation option work in fact Also, now doxygen is mandatory for building the documentation (looks reasonable because both man-pages and publican will need it). Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-13 01:54:45 +08:00
if BUILD_DOCS
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
SUBDIRS = doc
configure: Make documentation option work in fact Also, now doxygen is mandatory for building the documentation (looks reasonable because both man-pages and publican will need it). Signed-off-by: Tiago Vignatti <tiago.vignatti@intel.com>
2012-10-13 01:54:45 +08:00
endif
Update autotools configuration Use new libtool syntax and cleaning the code a bit
2010-11-06 08:55:27 +08:00
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
Split into a core repository that only holds the core Wayland libraries
2011-02-15 11:17:41 +08:00
build: Move AM_CFLAGS and AM_CPPFLAGS to the top of Makefile.am AM_CFLAGS and AM_CPPFLAGS aren't positional, so putting them at a random place in Makefile.am can be misleading. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:48 +08:00
AM_CPPFLAGS = \
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-I$(top_builddir)/protocol
build: Stop putting FFI_CFLAGS in AM_CFLAGS AM_CFLAGS are the defaults passed to anything that doesn't specify its own _CFLAGS, so instead of putting FFI_CFLAGS there, let's just add that to anything that actually needs it. The only thing that needs it but didn't have it specifically was libwayland_util (for connection.c) Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:49 +08:00
AM_CFLAGS = $(GCC_CFLAGS)
build: Move AM_CFLAGS and AM_CPPFLAGS to the top of Makefile.am AM_CFLAGS and AM_CPPFLAGS aren't positional, so putting them at a random place in Makefile.am can be misleading. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:48 +08:00
Split into a core repository that only holds the core Wayland libraries
2011-02-15 11:17:41 +08:00
aclocaldir = $(datadir)/aclocal
build: Add wayland-scanner.pc. To allow user program to include wayland-scanner.m4 in tarball, move the path variables from it into wayland-scanner.pc.
2013-07-02 17:38:15 +08:00
dist_aclocal_DATA = wayland-scanner.m4
Add wayland-scanner.mk to EXTRA_DIST for make distcheck
2011-02-24 17:53:06 +08:00
build: Move protocol/ Makefile.am into toplevel Makefile.am A small step towards non-recursive build system for wayland too.
2014-02-19 06:55:09 +08:00
dist_pkgdata_DATA = \
wayland-scanner.mk \
Revert "Remove protocol/wayland.dtd" This reverts commit 06fb8bd371403d43bc192577abd6b0a0c8b29c59. Having a DTD hooked up gives an indication of what we expect the protocol to be, which is a clearer documentation than the current "whatever scanner.c manages to parse". Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-11-09 12:14:59 +08:00
protocol/wayland.xml \
protocol/wayland.dtd
build: Move cursor Makefile.am into toplevel Makefile.am
2014-03-07 15:15:02 +08:00
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA =
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
bin_PROGRAMS = wayland-scanner
build: fix ./configure --disable-dtd-validation When configured with --disable-dtd-validation: CPPAS src/dtddata.o src/dtddata.S: Assembler messages: src/dtddata.S:39: Error: file not found: src/wayland.dtd.embed Makefile:1520: recipe for target 'src/dtddata.o' failed This is because the variable name used does not match the implicit variable name in autoconf. Fix the variable name, making both --disable-dtd-validation and --enable-dtd-validation to what they should. Do not try to build dtddata.S if dtd-validation is disabled. It depends on wayland.dtd.embed which is created by configure only if dtd-validation is enabled. If not building dtddata.S, also make sure the extern definitions in scanner.c are compiled out. Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575212 Reported-by: leio@gentoo.org Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Bryce Harrington <bryce@osg.samsung.com>
2016-02-29 20:59:51 +08:00
wayland_scanner_SOURCES = src/scanner.c
scanner: include config.h from command line Meson will need to build wayland-scanner twice with different config.h files, once for build and another for host machine. It will be easier to include the right config.h from compiler command line than playing with files. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
2019-03-11 23:05:33 +08:00
wayland_scanner_CPPFLAGS = $(AM_CPPFLAGS) -include config.h
Validate the protocol xml during scanning Embed the wayland.dtd protocol data into the scanner binary so we can validate external protocol files without requiring makefile changes. Hat-tip to Pekka Paalanen for the embedding trick. The embedding trick doesn't work well if the to-be-embedded file is in a different location than the source file, so copy/link it during configure and then build it in from the local directory. The current expat parser is not a validating parser, moving scanner.c to another parser has the risk of breaking compatibility. This patch adds libxml2 as extra (optional) dependency, but that also requires parsing the input twice. If the protocol fails validation a warning is printed but no error is returned otherwise. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-11-10 07:53:08 +08:00
wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(LIBXML_CFLAGS) $(AM_CFLAGS)
wayland_scanner_LDADD = $(EXPAT_LIBS) $(LIBXML_LIBS) libwayland-util.la
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
pkgconfig_DATA += src/wayland-scanner.pc
build: always build wayland-scanner The previous idiom for building a cross-compiled Wayland is to build once for the build host (with --enable-scanner --disable-libraries) to get a wayland-scanner binary that can then be used in a cross-compile (with --disable-scanner). The problem with this is that the cross wayland is missing a wayland-scanner binary, which means you then can't do any Wayland development on the target. Instead, always build wayland-scanner for the target and change --enable/disable-scanner to --with/without-host-scanner. Normal builds use the default of --without-host-scanner and run the wayland-scanner it just built, and cross-compiled builds pass --with-host-scanner to use a previously built host scanner but still get a wayland-scanner to install. (a theoretically neater solution would be to build two scanners if required (one to run and one to install), but automake makes this overly complicated) [daniels: Bikeshedded naming with Ross's OK.] Signed-off-by: Ross Burton <ross.burton@intel.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
2015-07-02 05:51:01 +08:00
build: fix ./configure --disable-dtd-validation When configured with --disable-dtd-validation: CPPAS src/dtddata.o src/dtddata.S: Assembler messages: src/dtddata.S:39: Error: file not found: src/wayland.dtd.embed Makefile:1520: recipe for target 'src/dtddata.o' failed This is because the variable name used does not match the implicit variable name in autoconf. Fix the variable name, making both --disable-dtd-validation and --enable-dtd-validation to what they should. Do not try to build dtddata.S if dtd-validation is disabled. It depends on wayland.dtd.embed which is created by configure only if dtd-validation is enabled. If not building dtddata.S, also make sure the extern definitions in scanner.c are compiled out. Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=575212 Reported-by: leio@gentoo.org Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Tested-by: Bryce Harrington <bryce@osg.samsung.com>
2016-02-29 20:59:51 +08:00
if DTD_VALIDATION
wayland_scanner_SOURCES += src/dtddata.S
endif
Validate the protocol xml during scanning Embed the wayland.dtd protocol data into the scanner binary so we can validate external protocol files without requiring makefile changes. Hat-tip to Pekka Paalanen for the embedding trick. The embedding trick doesn't work well if the to-be-embedded file is in a different location than the source file, so copy/link it during configure and then build it in from the local directory. The current expat parser is not a validating parser, moving scanner.c to another parser has the risk of breaking compatibility. This patch adds libxml2 as extra (optional) dependency, but that also requires parsing the input twice. If the protocol fails validation a warning is printed but no error is returned otherwise. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-11-10 07:53:08 +08:00
src/dtddata.o: protocol/wayland.dtd
build: always build wayland-scanner The previous idiom for building a cross-compiled Wayland is to build once for the build host (with --enable-scanner --disable-libraries) to get a wayland-scanner binary that can then be used in a cross-compile (with --disable-scanner). The problem with this is that the cross wayland is missing a wayland-scanner binary, which means you then can't do any Wayland development on the target. Instead, always build wayland-scanner for the target and change --enable/disable-scanner to --with/without-host-scanner. Normal builds use the default of --without-host-scanner and run the wayland-scanner it just built, and cross-compiled builds pass --with-host-scanner to use a previously built host scanner but still get a wayland-scanner to install. (a theoretically neater solution would be to build two scanners if required (one to run and one to install), but automake makes this overly complicated) [daniels: Bikeshedded naming with Ross's OK.] Signed-off-by: Ross Burton <ross.burton@intel.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
2015-07-02 05:51:01 +08:00
if USE_HOST_SCANNER
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
wayland_scanner = wayland-scanner
build: always build wayland-scanner The previous idiom for building a cross-compiled Wayland is to build once for the build host (with --enable-scanner --disable-libraries) to get a wayland-scanner binary that can then be used in a cross-compile (with --disable-scanner). The problem with this is that the cross wayland is missing a wayland-scanner binary, which means you then can't do any Wayland development on the target. Instead, always build wayland-scanner for the target and change --enable/disable-scanner to --with/without-host-scanner. Normal builds use the default of --without-host-scanner and run the wayland-scanner it just built, and cross-compiled builds pass --with-host-scanner to use a previously built host scanner but still get a wayland-scanner to install. (a theoretically neater solution would be to build two scanners if required (one to run and one to install), but automake makes this overly complicated) [daniels: Bikeshedded naming with Ross's OK.] Signed-off-by: Ross Burton <ross.burton@intel.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
2015-07-02 05:51:01 +08:00
else
$(BUILT_SOURCES) : wayland-scanner
wayland_scanner = $(top_builddir)/wayland-scanner
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
endif
build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere This will make it easier if we ever want to add new flags to everything in the future. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-19 00:27:21 +08:00
libwayland_util_la_CFLAGS = $(AM_CFLAGS)
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
libwayland_util_la_SOURCES = \
src/wayland-util.c \
build: Build a subset of libwayland_util when not building libraries The scanner doesn't need anything but wayland-util.c/.h so we can shrink wayland-util when not building the main libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:51 +08:00
src/wayland-util.h
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
noinst_LTLIBRARIES = libwayland-util.la
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
if ENABLE_LIBRARIES
build: Build libwayland-private This splits the bulk of libwayland-util into libwayland-private. libwayland-util (which is just wayland-util.c) is for use with the scanner. libwayland-private is everything else. Most things will want to link both libs. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-06-19 06:47:22 +08:00
noinst_LTLIBRARIES += libwayland-private.la
build: Allow disabling building of wayland libraries When cross-compiling it may be useful to build only the wayland-scanner natively. This patch makes it possible to disable build of the libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:50 +08:00
lib_LTLIBRARIES = libwayland-server.la libwayland-client.la
build: Build libwayland-private This splits the bulk of libwayland-util into libwayland-private. libwayland-util (which is just wayland-util.c) is for use with the scanner. libwayland-private is everything else. Most things will want to link both libs. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-06-19 06:47:22 +08:00
libwayland_private_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS)
libwayland_private_la_SOURCES = \
build: Build a subset of libwayland_util when not building libraries The scanner doesn't need anything but wayland-util.c/.h so we can shrink wayland-util when not building the main libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:51 +08:00
src/connection.c \
src/wayland-os.c \
src/wayland-os.h \
Move wl_priv_signal to wayland-server-private.h Including wayland-server-core.h in wayland-private.h is problematic because wayland-private.h is included by wayland-scanner which should be able to build against non-POSIX platforms (e.g. MinGW). The only reason that wayland-server-core.h was included in wayland-private.h was for the wl_private_signal definitions, so move those to a wayland-server-private.h file that can be included by both wayland-server.c and the tests. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
2019-11-05 23:09:50 +08:00
src/wayland-private.h \
src/wayland-server-private.h
build: Build a subset of libwayland_util when not building libraries The scanner doesn't need anything but wayland-util.c/.h so we can shrink wayland-util when not building the main libraries. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-18 04:13:51 +08:00
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
include_HEADERS = \
src/wayland-util.h \
src/wayland-server.h \
introduce new headers wayland-client-core.h and wayland-server-core.h wayland-client.h and wayland-server.h include the protocol headers generated at build time. This means that a libwayland user cannot generate and use protocol code created from a wayland.xml newer than the installed libwayland, because it is not possible to only include the API header. Another use case is language bindings, which would generate their own protocol code and which only need to use the library ABI, not the generated C code. This commit adds wayland-client-core.h and wayland-server-core.h which do not include the protocol headers or any deprecated code. Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-04-29 21:34:47 +08:00
src/wayland-server-core.h \
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
src/wayland-client.h \
introduce new headers wayland-client-core.h and wayland-server-core.h wayland-client.h and wayland-server.h include the protocol headers generated at build time. This means that a libwayland user cannot generate and use protocol code created from a wayland.xml newer than the installed libwayland, because it is not possible to only include the API header. Another use case is language bindings, which would generate their own protocol code and which only need to use the library ABI, not the generated C code. This commit adds wayland-client-core.h and wayland-server-core.h which do not include the protocol headers or any deprecated code. Reviewed-by: Jason Ekstrand <jason@jlekstrand.net> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-04-29 21:34:47 +08:00
src/wayland-client-core.h \
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
src/wayland-version.h
Do not distribute generated headers The wayland-server-protocol.h and wayland-client-protocol.h headers are currently being shipped in tarballs created using make dist. This causes out-of-tree builds to fail since make will detect that the headers exist by looking at the source directory (via VPATH) and not regenerate them. But as opposed to ${top_builddir}/protocol, ${top_srcdir}/protocol is not part of the include path and therefore the shipped files can't be found during compilation. Two solutions exist to this problem: 1) add ${top_srcdir}/protocol to the include path to allow shipped files to be used if available or 2) don't ship these generated files in release tarballs. The latter seems the most appropriate. wayland-scanner is already a prerequisite in order to generate wayland-protocol.c, so it is either built as part of the package or provided externally. Generating all files from the protocol definition at build time also ensures that they don't get out of sync. Both of the generated headers are already listed in Makefile.am as nodist_*_SOURCES, but at the same time they appear in include_HEADERS, which will cause them to be added to the list of distributable files after all. To prevent that, split them off into nodist_include_HEADERS. Note that this problem will be hidden if a previous version of wayland has been installed, since these files will exist in /usr/include and be included from there. So this build error will only show for out-of-tree builds on systems that don't have wayland installed yet. Signed-off-by: Thierry Reding <treding@nvidia.com>
2014-05-07 20:09:35 +08:00
nodist_include_HEADERS = \
protocol/wayland-server-protocol.h \
protocol/wayland-client-protocol.h
build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere This will make it easier if we ever want to add new flags to everything in the future. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-19 00:27:21 +08:00
libwayland_server_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
configure: detect libdl and librt Signed-off-by: Leonid Bobrov <mazocomp@disroot.org>
2019-02-26 01:38:02 +08:00
libwayland_server_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
libwayland_server_la_LDFLAGS = -version-info 1:0:1
libwayland_server_la_SOURCES = \
src/wayland-server.c \
src/wayland-shm.c \
src/event-loop.c
nodist_libwayland_server_la_SOURCES = \
build: depend on generated protocol headers Fixes the build failure where the protocol headers were not generated at all before compiling src/.libs/libwayland_server_la-wayland-server.o. The failure was reproducable by starting fresh with 'git clean -dxf' and not having any wayland headers installed system-wide. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2014-03-10 20:03:57 +08:00
protocol/wayland-server-protocol.h \
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
protocol/wayland-protocol.c
build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere This will make it easier if we ever want to add new flags to everything in the future. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-19 00:27:21 +08:00
libwayland_client_la_CFLAGS = $(FFI_CFLAGS) $(AM_CFLAGS) -pthread
configure: detect libdl and librt Signed-off-by: Leonid Bobrov <mazocomp@disroot.org>
2019-02-26 01:38:02 +08:00
libwayland_client_la_LIBADD = $(FFI_LIBS) libwayland-private.la libwayland-util.la $(RT_LIBS) -lm
client: extend error handling When an error occurs, wl_display_get_error() does not provide any way of getting know if it was a local error or if it was an error event, respectively what object caused the error and what the error was. This patch introduces a new function wl_display_get_protocol_error() which will return error code, interface and id of the object that generated the error. wl_display_get_error() will work the same way as before. wl_display_get_protocol_error() DOES NOT indicate that a non-protocol error happened. It returns valid information only in that case that (protocol) error occurred, so it should be used after calling wl_display_get_error() with positive result. [Pekka Paalanen] Applied another hunk of Bryce's comments to docs, added libtool version bump. Reviewed-by: Pekka Paalanen <ppaalanen@gmail.com> Reviewed-by: Bryce Harrington <b.harrington@samsung.com>
2014-06-20 15:29:52 +08:00
libwayland_client_la_LDFLAGS = -version-info 3:0:3
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
libwayland_client_la_SOURCES = \
src/wayland-client.c
nodist_libwayland_client_la_SOURCES = \
build: depend on generated protocol headers Fixes the build failure where the protocol headers were not generated at all before compiling src/.libs/libwayland_server_la-wayland-server.o. The failure was reproducable by starting fresh with 'git clean -dxf' and not having any wayland headers installed system-wide. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2014-03-10 20:03:57 +08:00
protocol/wayland-client-protocol.h \
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
protocol/wayland-protocol.c
pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc
protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml
build: use public-code when using the local wayland-scanner The core wayland interfaces are public, via the libwayland-server and libwayland-client DSOs. Hence use "public-code" cmdline option, instead of the deprecated code". As the host wayland-scanner may not know about the new option, use the legacy "code". Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
2018-02-17 00:22:31 +08:00
if USE_HOST_SCANNER
autotools: use strict wayland-scanner mode Otherwise an invalid protocol will print warnings to stdout but won't make the build fail. Signed-off-by: Simon Ser <contact@emersion.fr>
2020-01-14 02:18:13 +08:00
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) -s code $< $@
build: use public-code when using the local wayland-scanner The core wayland interfaces are public, via the libwayland-server and libwayland-client DSOs. Hence use "public-code" cmdline option, instead of the deprecated code". As the host wayland-scanner may not know about the new option, use the legacy "code". Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
2018-02-17 00:22:31 +08:00
else
autotools: use strict wayland-scanner mode Otherwise an invalid protocol will print warnings to stdout but won't make the build fail. Signed-off-by: Simon Ser <contact@emersion.fr>
2020-01-14 02:18:13 +08:00
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) -s public-code $< $@
build: use public-code when using the local wayland-scanner The core wayland interfaces are public, via the libwayland-server and libwayland-client DSOs. Hence use "public-code" cmdline option, instead of the deprecated code". As the host wayland-scanner may not know about the new option, use the legacy "code". Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
2018-02-17 00:22:31 +08:00
endif
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
protocol/%-server-protocol.h : $(top_srcdir)/protocol/%.xml
autotools: use strict wayland-scanner mode Otherwise an invalid protocol will print warnings to stdout but won't make the build fail. Signed-off-by: Simon Ser <contact@emersion.fr>
2020-01-14 02:18:13 +08:00
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) -s server-header $< $@
build: Move cursor Makefile.am into toplevel Makefile.am
2014-03-07 15:15:02 +08:00
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
protocol/%-client-protocol.h : $(top_srcdir)/protocol/%.xml
autotools: use strict wayland-scanner mode Otherwise an invalid protocol will print warnings to stdout but won't make the build fail. Signed-off-by: Simon Ser <contact@emersion.fr>
2020-01-14 02:18:13 +08:00
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) -s client-header $< $@
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
tests: add an headers test This test checks that the protocol and library headers include only what they are supposed to include. That is, that the core headers do not include the protocol headers and that the core protocol headers do not include the non core library headers. The build process now generates core protocol headers, but they are only used in the test and don't get installed. Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2015-05-22 01:43:13 +08:00
protocol/%-server-protocol-core.h : $(top_srcdir)/protocol/%.xml
autotools: use strict wayland-scanner mode Otherwise an invalid protocol will print warnings to stdout but won't make the build fail. Signed-off-by: Simon Ser <contact@emersion.fr>
2020-01-14 02:18:13 +08:00
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) -s server-header -c < $< > $@
tests: add an headers test This test checks that the protocol and library headers include only what they are supposed to include. That is, that the core headers do not include the protocol headers and that the core protocol headers do not include the non core library headers. The build process now generates core protocol headers, but they are only used in the test and don't get installed. Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2015-05-22 01:43:13 +08:00
protocol/%-client-protocol-core.h : $(top_srcdir)/protocol/%.xml
autotools: use strict wayland-scanner mode Otherwise an invalid protocol will print warnings to stdout but won't make the build fail. Signed-off-by: Simon Ser <contact@emersion.fr>
2020-01-14 02:18:13 +08:00
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(wayland_scanner) -s client-header -c < $< > $@
tests: add an headers test This test checks that the protocol and library headers include only what they are supposed to include. That is, that the core headers do not include the protocol headers and that the core protocol headers do not include the non core library headers. The build process now generates core protocol headers, but they are only used in the test and don't get installed. Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2015-05-22 01:43:13 +08:00
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
BUILT_SOURCES = \
$(nodist_libwayland_server_la_SOURCES) \
tests: add an headers test This test checks that the protocol and library headers include only what they are supposed to include. That is, that the core headers do not include the protocol headers and that the core protocol headers do not include the non core library headers. The build process now generates core protocol headers, but they are only used in the test and don't get installed. Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2015-05-22 01:43:13 +08:00
$(nodist_libwayland_client_la_SOURCES) \
tests: Add a test for fd leaks on zombie objects Until recently, if a client destroying a resource raced with the server generating an event on that resource that delivered a file descriptor, we would leak the fd. This tests for a leaked fd from that race condition. Reviewed-by: Daniel Stone <daniels@collabora.com> Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
2017-12-07 01:22:24 +08:00
$(nodist_headers_test_SOURCES) \
$(nodist_display_test_SOURCES)
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
docs: remove and ignore doc/doxygen_sqlite3.db Some newer versions of doxygen are generating this file now, and if we don't clean it up distcheck will fail. Known to affect doxygen 1.8.8 from debian jessie. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com> Tested-by: Jon A. Cruz <jonc@osg.samsung.com>
2015-05-28 23:19:09 +08:00
CLEANFILES = $(BUILT_SOURCES) doc/doxygen/doxygen_sqlite3.db
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
DISTCLEANFILES = src/wayland-version.h
doc: move Contributing Gitlab expects a CONTRIBUTING.md in the root directory, so move our guide there. Conversion to proper markup is a follow-up patch. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
2018-06-13 17:45:36 +08:00
EXTRA_DIST = CONTRIBUTING.md
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
lib_LTLIBRARIES += libwayland-cursor.la
include_HEADERS += cursor/wayland-cursor.h
build: Move cursor Makefile.am into toplevel Makefile.am
2014-03-07 15:15:02 +08:00
libwayland_cursor_la_SOURCES = \
cursor/wayland-cursor.c \
cursor/os-compatibility.c \
cursor/os-compatibility.h \
cursor/cursor-data.h \
cursor/xcursor.c \
cursor/xcursor.h
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
libwayland_cursor_la_LIBADD = libwayland-client.la
build: Move cursor Makefile.am into toplevel Makefile.am
2014-03-07 15:15:02 +08:00
build: Move src/Makefile.am into toplevel Makefile.am
2014-03-07 15:45:56 +08:00
pkgconfig_DATA += cursor/wayland-cursor.pc
build: Move cursor Makefile.am into toplevel Makefile.am
2014-03-07 15:15:02 +08:00
libwayland_cursor_la_CFLAGS = \
build: Use AM_CFLAGS instead of GCC_CFLAGS everywhere This will make it easier if we ever want to add new flags to everything in the future. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Jon A. Cruz <jonc@osg.samsung.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2015-06-19 00:27:21 +08:00
$(AM_CFLAGS) \
build: Move cursor Makefile.am into toplevel Makefile.am
2014-03-07 15:15:02 +08:00
-I$(top_builddir)/src \
-I$(top_srcdir)/src \
-DICONDIR=\"$(ICONDIR)\"
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
build: wire-up wayland-egl Wire-up the imported sources, test and pkg-config files. v2: - Don't mangle with existing EXTRA_DIST list - Add the symbols check script to the `make check' target - Rename wayland-egl-{priv,backend}.h Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
2017-10-10 21:43:48 +08:00
lib_LTLIBRARIES += libwayland-egl.la
wayland-egl: move the wayland-egl{, -core}.h headers to egl/ Now we have all the wayland-egl bits in a single place. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
2017-10-10 21:43:50 +08:00
include_HEADERS += egl/wayland-egl.h
include_HEADERS += egl/wayland-egl-core.h
build: wire-up wayland-egl Wire-up the imported sources, test and pkg-config files. v2: - Don't mangle with existing EXTRA_DIST list - Add the symbols check script to the `make check' target - Rename wayland-egl-{priv,backend}.h Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
2017-10-10 21:43:48 +08:00
libwayland_egl_la_SOURCES = egl/wayland-egl.c
libwayland_egl_la_LDFLAGS = -version-info 1
pkgconfig_DATA += egl/wayland-egl.pc
## XXX: backend interface
include_HEADERS += egl/wayland-egl-backend.h
pkgconfig_DATA += egl/wayland-egl-backend.pc
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
Makefile: do not put TESTS into check_PROGRAMS If you assign TESTS into check_PROGRAMS, you cannot add a test that is not built from source files. Instead, use a temporary variable built_test_programs to hold the names that are both programs built from source files and tests to execute. This change is required by the following patch adding wayland-scanner test script. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-11-09 23:16:51 +08:00
built_test_programs = \
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
array-test \
client-test \
display-test \
connection-test \
event-loop-test \
fixed-test \
tests: Test wl_interface_equal The test suite did not cover wl_interface_equal, so add one test that specifically tests this method. Add the new test to Makefile.am. Signed-off-by: Yong Bakos <ybakos@humanoriented.com> [Pekka: add assert(&wl_registry_interface != &copy);] Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-11-08 23:56:30 +08:00
interface-test \
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
list-test \
map-test \
os-wrappers-test \
sanity-test \
socket-test \
queue-test \
proxy: Add API to tag proxy objects When an application and a toolkit share the same Wayland connection, it will receive events with each others objects. For example if the toolkit manages a set of surfaces, and the application another set, if both the toolkit and application listen to pointer focus events, they'll receive focus events for each others surfaces. In order for the toolkit and application layers to identify whether a surface is managed by itself or not, it cannot only rely on retrieving the proxy user data, without going through all it's own proxy objects finding whether it's one of them. By adding the ability to "tag" a proxy object, the toolkit and application can use the tag to identify what the user data pointer points to something known. To create a tag, the recommended way is to define a statically allocated constant char array containing some descriptive string. The tag will be the pointer to the non-const pointer to the beginning of the array. For example, to identify whether a focus event is for a surface managed by the code in question: static const char *my_tag = "my tag"; static void pointer_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, wl_fixed_t surface_y) { struct window *window; const char * const *tag; tag = wl_proxy_get_tag((struct wl_proxy *) surface); if (tag != &my_tag) return; window = wl_surface_get_user_data(surface); ... } ... static void init_window_surface(struct window *window) { struct wl_surface *surface; surface = wl_compositor_create_surface(compositor); wl_surface_set_user_data(surface, window); wl_proxy_set_tag((struct wl_proxy *) surface, &my_tag); } Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
2019-07-10 15:13:33 +08:00
proxy-test \
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
signal-test \
server: add a safer signal type and port wl_display to it wl_list_for_each_safe, which is used by wl_signal_emit is not really safe. If a signal has two listeners, and the first one removes and re-inits the second one, it would enter an infinite loop, which was hit in weston on resource destruction, which emits a signal. This commit adds a new version of wl_signal, called wl_priv_signal, which is private in wayland-server.c and which does not have this problem. The old wl_signal cannot be improved without breaking backwards compatibility. Signed-off-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2017-01-24 22:34:28 +08:00
newsignal-test \
tests: Add message version sanity test Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
2014-05-09 05:39:48 +08:00
resources-test \
tests: add an headers test This test checks that the protocol and library headers include only what they are supposed to include. That is, that the core headers do not include the protocol headers and that the core protocol headers do not include the non core library headers. The build process now generates core protocol headers, but they are only used in the test and don't get installed. Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2015-05-22 01:43:13 +08:00
message-test \
server: add listener API for new clients Using display object, Emit a signal if a new client is created. In the server-side, we can get the destroy event of a client, But there is no way to get the created event of it. Of course, we can get the client object from the global registry binding callbacks. But it can be called several times with same client object. And even if A client creates display object, (so there is a connection), The server could not know that. There could be more use-cases not only for this. Giulio: a test is added for the new functionality Signed-off-by: Sung-jae Park <nicesj@nicesj.com> Signed-off-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-08-09 18:46:51 +08:00
headers-test \
Add API to install protocol loggers on the server wl_display The new wl_display_add_protocol_logger allows to set a function as a logger, which will get called when a new request is received or an event is sent. This is akin to setting WAYLAND_DEBUG=1, but more powerful because it can be enabled at run time and allows to show the log e.g. in a UI view. A test is added for the new functionality. Signed-off-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-08-12 15:33:06 +08:00
compositor-introspection-test \
build: wire-up wayland-egl Wire-up the imported sources, test and pkg-config files. v2: - Don't mangle with existing EXTRA_DIST list - Add the symbols check script to the `make check' target - Rename wayland-egl-{priv,backend}.h Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
2017-10-10 21:43:48 +08:00
protocol-logger-test \
wayland-egl-abi-check
EXTRA_DIST += egl/wayland-egl-symbols-check
check_PROGRAMS = wayland-egl-abi-check
wayland_egl_abi_check_SOURCES = egl/wayland-egl-abi-check.c
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
tests: C++ compilation test This test includes one of wayland headers, which produced error with C++ compiler. C compiler can't be used for this test, because it issues only a warning[1] and only when wayland headers are not installed in system headers path (/usr/include). [1] wayland-server-protocol.h:201:2: warning: implicit declaration of function ‘wl_resource_post_event’ [daniels: Merged in Marek's follow-up to check for a C++ compiler.] Signed-off-by: Mariusz Ceier <mceier+wayland@gmail.com> Signed-off-by: Marek Chalupa <mchqwerty@gmail.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
2014-12-15 18:33:53 +08:00
if ENABLE_CPP_TEST
Makefile: do not put TESTS into check_PROGRAMS If you assign TESTS into check_PROGRAMS, you cannot add a test that is not built from source files. Instead, use a temporary variable built_test_programs to hold the names that are both programs built from source files and tests to execute. This change is required by the following patch adding wayland-scanner test script. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-11-09 23:16:51 +08:00
built_test_programs += cpp-compile-test
tests: C++ compilation test This test includes one of wayland headers, which produced error with C++ compiler. C compiler can't be used for this test, because it issues only a warning[1] and only when wayland headers are not installed in system headers path (/usr/include). [1] wayland-server-protocol.h:201:2: warning: implicit declaration of function ‘wl_resource_post_event’ [daniels: Merged in Marek's follow-up to check for a C++ compiler.] Signed-off-by: Mariusz Ceier <mceier+wayland@gmail.com> Signed-off-by: Marek Chalupa <mchqwerty@gmail.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
2014-12-15 18:33:53 +08:00
endif
tests: add scanner tests Add tests that ensure that wayland-scanner output for a given input does not change unexpectedly. This makes it very easy to review wayland-scanner patches. Before, when patches were proposed for wayland-scanner, I had to build wayland without the patches, save the generated files into a temporary directory, apply the patches, build again, and diff the old vs. new generated file. No more. Now whenever someone makes intentional changes to wayland-scanner's output, he will also have to patch the example output files to match. That means that reviewers see the diff of the generated files straight from the patch itself. Verifying the diff is true is as easy as 'make check'. The tests use separate example XML files instead of wayland.xml directly, so that wayland.xml can be updated without fixing scanner tests, avoiding the churn. example.xml starts as a copy of wayland.xml. If wayland.xml starts using new wayland-scanner features, they should be copied into example.xml again to be covered by the tests. This patch relies on the previous patch to actually add all the data files for input and reference output. The scanner output is fed through sed to remove parts that are allowed to vary: the scanner version string. v2: no need for scanner-test.sh to depend on the test data Task: https://phabricator.freedesktop.org/T3313 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> (v1) Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Tested-by: Yong Bakos <ybakos@humanoriented.com>
2016-09-30 20:12:47 +08:00
AM_TESTS_ENVIRONMENT = \
export WAYLAND_SCANNER='$(top_builddir)/wayland-scanner' \
TEST_DATA_DIR='$(top_srcdir)/tests/data' \
TEST_OUTPUT_DIR='$(top_builddir)/tests/output' \
wayland-egl: set the correct path to libwayland-egl.so Earlier commit changed to passing the binary name as env. variable introducing a typo. That went unnoticed, since we do not check if the file is present or not. Cc: Pukka Paalanen <ppaalanen@gmail.com> Cc: Daniel Stone <daniels@collabora.com> Fixes: 85cb5ed64aa ("wayland-egl-symbols-check: pass the DSO name via the build system") Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2018-03-17 00:14:54 +08:00
WAYLAND_EGL_LIB='$(top_builddir)/.libs/libwayland-egl.so' \
tests: add scanner tests Add tests that ensure that wayland-scanner output for a given input does not change unexpectedly. This makes it very easy to review wayland-scanner patches. Before, when patches were proposed for wayland-scanner, I had to build wayland without the patches, save the generated files into a temporary directory, apply the patches, build again, and diff the old vs. new generated file. No more. Now whenever someone makes intentional changes to wayland-scanner's output, he will also have to patch the example output files to match. That means that reviewers see the diff of the generated files straight from the patch itself. Verifying the diff is true is as easy as 'make check'. The tests use separate example XML files instead of wayland.xml directly, so that wayland.xml can be updated without fixing scanner tests, avoiding the churn. example.xml starts as a copy of wayland.xml. If wayland.xml starts using new wayland-scanner features, they should be copied into example.xml again to be covered by the tests. This patch relies on the previous patch to actually add all the data files for input and reference output. The scanner output is fed through sed to remove parts that are allowed to vary: the scanner version string. v2: no need for scanner-test.sh to depend on the test data Task: https://phabricator.freedesktop.org/T3313 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> (v1) Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Tested-by: Yong Bakos <ybakos@humanoriented.com>
2016-09-30 20:12:47 +08:00
SED=$(SED) \
wayland-egl: Pass nm path to check script A previous patch used $NM as an environment variable, but this was only set as a make variable. Make sure it is passed through from make to the environment we use to run tests. v2: Quote argument when passing to shell. Signed-off-by: Daniel Stone <daniels@collabora.com> Reported-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Fixes: 6903e4d53925 ("wayland-egl: use correct `nm` path when cross-compiling") Cc: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
2018-03-19 20:20:54 +08:00
NM='$(NM)' \
tests: add scanner tests Add tests that ensure that wayland-scanner output for a given input does not change unexpectedly. This makes it very easy to review wayland-scanner patches. Before, when patches were proposed for wayland-scanner, I had to build wayland without the patches, save the generated files into a temporary directory, apply the patches, build again, and diff the old vs. new generated file. No more. Now whenever someone makes intentional changes to wayland-scanner's output, he will also have to patch the example output files to match. That means that reviewers see the diff of the generated files straight from the patch itself. Verifying the diff is true is as easy as 'make check'. The tests use separate example XML files instead of wayland.xml directly, so that wayland.xml can be updated without fixing scanner tests, avoiding the churn. example.xml starts as a copy of wayland.xml. If wayland.xml starts using new wayland-scanner features, they should be copied into example.xml again to be covered by the tests. This patch relies on the previous patch to actually add all the data files for input and reference output. The scanner output is fed through sed to remove parts that are allowed to vary: the scanner version string. v2: no need for scanner-test.sh to depend on the test data Task: https://phabricator.freedesktop.org/T3313 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> (v1) Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Tested-by: Yong Bakos <ybakos@humanoriented.com>
2016-09-30 20:12:47 +08:00
;
TESTS = $(built_test_programs) \
build: wire-up wayland-egl Wire-up the imported sources, test and pkg-config files. v2: - Don't mangle with existing EXTRA_DIST list - Add the symbols check script to the `make check' target - Rename wayland-egl-{priv,backend}.h Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
2017-10-10 21:43:48 +08:00
egl/wayland-egl-symbols-check \
tests: add scanner tests Add tests that ensure that wayland-scanner output for a given input does not change unexpectedly. This makes it very easy to review wayland-scanner patches. Before, when patches were proposed for wayland-scanner, I had to build wayland without the patches, save the generated files into a temporary directory, apply the patches, build again, and diff the old vs. new generated file. No more. Now whenever someone makes intentional changes to wayland-scanner's output, he will also have to patch the example output files to match. That means that reviewers see the diff of the generated files straight from the patch itself. Verifying the diff is true is as easy as 'make check'. The tests use separate example XML files instead of wayland.xml directly, so that wayland.xml can be updated without fixing scanner tests, avoiding the churn. example.xml starts as a copy of wayland.xml. If wayland.xml starts using new wayland-scanner features, they should be copied into example.xml again to be covered by the tests. This patch relies on the previous patch to actually add all the data files for input and reference output. The scanner output is fed through sed to remove parts that are allowed to vary: the scanner version string. v2: no need for scanner-test.sh to depend on the test data Task: https://phabricator.freedesktop.org/T3313 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> (v1) Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Tested-by: Yong Bakos <ybakos@humanoriented.com>
2016-09-30 20:12:47 +08:00
tests/scanner-test.sh
Makefile: do not put TESTS into check_PROGRAMS If you assign TESTS into check_PROGRAMS, you cannot add a test that is not built from source files. Instead, use a temporary variable built_test_programs to hold the names that are both programs built from source files and tests to execute. This change is required by the following patch adding wayland-scanner test script. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-11-09 23:16:51 +08:00
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
noinst_PROGRAMS = \
Makefile: build also test programs during a normal build Put also test programs into noinst_PROGRAMS so that they get always built. In check_PROGRAMS they are built for 'make check' but not for 'make'. This makes it harder to accidentally break the test programs. v2: also change check_LTLIBRARIES to noinst_LTLIBRARIES Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Daniel Stone <daniels@collabora.com>
2016-11-16 19:42:21 +08:00
$(built_test_programs) \
exec-fd-leak-checker \
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
fixed-benchmark
tests: fix main symbol duplication So far I got these errors before patching: libtool: link: cc -o .libs/headers-test -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/headers-test.o tests/headers-protocol-test.o tests/headers-protocol-core-test.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at headers-test.c:53 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/headers-test.c:53) >>> tests/headers-test.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a libtool: link: cc -o .libs/exec-fd-leak-checker -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/exec-fd-leak-checker.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at exec-fd-leak-checker.c:57 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/exec-fd-leak-checker.c:57) >>> tests/exec-fd-leak-checker.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a Makefile.am: error: object 'tests/test-helpers.$(OBJEXT)' created both with libtool and without libtool: link: cc -o .libs/fixed-benchmark -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/fixed-benchmark.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at fixed-benchmark.c:100 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/fixed-benchmark.c:100) >>> tests/fixed-benchmark.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a This commit fixes all of that. Signed-off-by: Leonid Bobrov <mazocomp@disroot.org> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
2019-02-13 19:39:06 +08:00
noinst_LTLIBRARIES += \
libtest-runner.la \
libtest-helpers.la
libtest_helpers_la_SOURCES = tests/test-helpers.c
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
libtest_runner_la_SOURCES = \
tests/test-runner.c \
tests/test-runner.h \
tests: add test-compositor This patch introduces a set of functions that can create a display and clients for tests. On server side the user can use functions: display_create() display_destroy() create_client() display_run() display_resume() and on client side the user can use: client_connect() client_disconnect() stop_display() The stop_display() and display_resume() are functions that serve as a barrier and also allow the display to take some action after the display_run() was called, because after the display is stopped, it can run arbitrary code until it calls display_resume(). client_connect() function connects to wayland display and creates a proxy to test_compositor global object, so it can ask for stopping the display later using stop_display(). An example: void client_main() { /* or client can use wl_display_connect(NULL) * and do all the stuff manually */ struct client *c = client_connect(); /* do some stuff, ... */ /* stop the display so that it can * do some other stuff */ stop_display(c, 1); /* ... */ client_disconnect(c); } TEST(dummy_tst) { struct display *d = display_create(); /* set up the display */ wl_global_create(d->wl_display, ...); /* ... */ create_client(d, client_main); display_run(); /* if we are here, the display has been stopped * and we can do some code, i. e. create another global or so */ wl_global_create(d->wl_display, ...); /* ... */ display_resume(d); /* resume display and clients */ display_destroy(d); } v2: added/changed message in few asserts that were not clear fixed codying style issues and typo client_create_with_name: fixed a condition in an assert get_socket_name: use also pid check_error: fix errno -> err [Pekka Paalanen: added test-compositor.h to SOURCES, added WL_HIDE_DEPRECATED to get rid of deprecated defs and lots of warnings, fixed one unchecked return value from write().] Signed-off-by: Marek Chalupa <mchqwerty@gmail.com> Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2014-08-21 22:52:16 +08:00
tests/test-compositor.h \
tests/test-compositor.c
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
libtest_runner_la_LIBADD = \
build: Build libwayland-private This splits the bulk of libwayland-util into libwayland-private. libwayland-util (which is just wayland-util.c) is for use with the scanner. libwayland-private is everything else. Most things will want to link both libs. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-06-19 06:47:22 +08:00
libwayland-private.la \
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
libwayland-util.la \
libwayland-client.la \
libwayland-server.la \
tests: fix main symbol duplication So far I got these errors before patching: libtool: link: cc -o .libs/headers-test -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/headers-test.o tests/headers-protocol-test.o tests/headers-protocol-core-test.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at headers-test.c:53 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/headers-test.c:53) >>> tests/headers-test.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a libtool: link: cc -o .libs/exec-fd-leak-checker -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/exec-fd-leak-checker.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at exec-fd-leak-checker.c:57 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/exec-fd-leak-checker.c:57) >>> tests/exec-fd-leak-checker.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a Makefile.am: error: object 'tests/test-helpers.$(OBJEXT)' created both with libtool and without libtool: link: cc -o .libs/fixed-benchmark -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/fixed-benchmark.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at fixed-benchmark.c:100 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/fixed-benchmark.c:100) >>> tests/fixed-benchmark.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a This commit fixes all of that. Signed-off-by: Leonid Bobrov <mazocomp@disroot.org> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
2019-02-13 19:39:06 +08:00
libtest-helpers.la \
configure: detect libdl and librt Signed-off-by: Leonid Bobrov <mazocomp@disroot.org>
2019-02-26 01:38:02 +08:00
$(RT_LIBS) $(DL_LIBS) $(FFI_LIBS)
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
array_test_SOURCES = tests/array-test.c
array_test_LDADD = libtest-runner.la
client_test_SOURCES = tests/client-test.c
client_test_LDADD = libtest-runner.la
Add a missing -pthread to fix compile with slibtool. When compiling wayland with slibtool instead of GNU libtool it will fail building libtest_runner with an undefined reference to pthread_join@@GLIBC_2.2.5. This is because -pthread (Or -lpthread) is missing from display_test. If its added the build succeeds as expected with slibtool and continues to work with libtool. Its likely that libtool is hiding this failure by silently adding the missing flag which is not uncommon... Exposed in commit aa51a833eb9b3d8fb58a64ff685b249d65ec35b5. Fixes https://gitlab.freedesktop.org/wayland/wayland/issues/91 Signed-off-by: orbea <orbea@riseup.net>
2019-05-31 23:09:35 +08:00
display_test_CFLAGS = -pthread
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
display_test_SOURCES = tests/display-test.c
display_test_LDADD = libtest-runner.la
tests: Add a test for fd leaks on zombie objects Until recently, if a client destroying a resource raced with the server generating an event on that resource that delivered a file descriptor, we would leak the fd. This tests for a leaked fd from that race condition. Reviewed-by: Daniel Stone <daniels@collabora.com> Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
2017-12-07 01:22:24 +08:00
nodist_display_test_SOURCES = \
protocol/tests-server-protocol.h \
protocol/tests-client-protocol.h \
protocol/tests-protocol.c
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
connection_test_SOURCES = tests/connection-test.c
connection_test_LDADD = libtest-runner.la
event_loop_test_SOURCES = tests/event-loop-test.c
event_loop_test_LDADD = libtest-runner.la
fixed_test_SOURCES = tests/fixed-test.c
fixed_test_LDADD = libtest-runner.la
tests: Test wl_interface_equal The test suite did not cover wl_interface_equal, so add one test that specifically tests this method. Add the new test to Makefile.am. Signed-off-by: Yong Bakos <ybakos@humanoriented.com> [Pekka: add assert(&wl_registry_interface != &copy);] Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-11-08 23:56:30 +08:00
interface_test_SOURCES = tests/interface-test.c
interface_test_LDADD = libtest-runner.la
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
list_test_SOURCES = tests/list-test.c
list_test_LDADD = libtest-runner.la
map_test_SOURCES = tests/map-test.c
map_test_LDADD = libtest-runner.la
sanity_test_SOURCES = tests/sanity-test.c
sanity_test_LDADD = libtest-runner.la
socket_test_SOURCES = tests/socket-test.c
socket_test_LDADD = libtest-runner.la
queue_test_SOURCES = tests/queue-test.c
queue_test_LDADD = libtest-runner.la
proxy: Add API to tag proxy objects When an application and a toolkit share the same Wayland connection, it will receive events with each others objects. For example if the toolkit manages a set of surfaces, and the application another set, if both the toolkit and application listen to pointer focus events, they'll receive focus events for each others surfaces. In order for the toolkit and application layers to identify whether a surface is managed by itself or not, it cannot only rely on retrieving the proxy user data, without going through all it's own proxy objects finding whether it's one of them. By adding the ability to "tag" a proxy object, the toolkit and application can use the tag to identify what the user data pointer points to something known. To create a tag, the recommended way is to define a statically allocated constant char array containing some descriptive string. The tag will be the pointer to the non-const pointer to the beginning of the array. For example, to identify whether a focus event is for a surface managed by the code in question: static const char *my_tag = "my tag"; static void pointer_enter(void *data, struct wl_pointer *wl_pointer, uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, wl_fixed_t surface_y) { struct window *window; const char * const *tag; tag = wl_proxy_get_tag((struct wl_proxy *) surface); if (tag != &my_tag) return; window = wl_surface_get_user_data(surface); ... } ... static void init_window_surface(struct window *window) { struct wl_surface *surface; surface = wl_compositor_create_surface(compositor); wl_surface_set_user_data(surface, window); wl_proxy_set_tag((struct wl_proxy *) surface, &my_tag); } Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
2019-07-10 15:13:33 +08:00
proxy_test_SOURCES = tests/proxy-test.c
proxy_test_LDADD = libtest-runner.la
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
signal_test_SOURCES = tests/signal-test.c
signal_test_LDADD = libtest-runner.la
server: add a safer signal type and port wl_display to it wl_list_for_each_safe, which is used by wl_signal_emit is not really safe. If a signal has two listeners, and the first one removes and re-inits the second one, it would enter an infinite loop, which was hit in weston on resource destruction, which emits a signal. This commit adds a new version of wl_signal, called wl_priv_signal, which is private in wayland-server.c and which does not have this problem. The old wl_signal cannot be improved without breaking backwards compatibility. Signed-off-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2017-01-24 22:34:28 +08:00
# wayland-server.c is needed here to access wl_priv_* functions
newsignal_test_SOURCES = tests/newsignal-test.c src/wayland-server.c
newsignal_test_LDADD = libtest-runner.la
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
resources_test_SOURCES = tests/resources-test.c
resources_test_LDADD = libtest-runner.la
tests: Add message version sanity test Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
2014-05-09 05:39:48 +08:00
message_test_SOURCES = tests/message-test.c
message_test_LDADD = libtest-runner.la
server: add listener API for new clients Using display object, Emit a signal if a new client is created. In the server-side, we can get the destroy event of a client, But there is no way to get the created event of it. Of course, we can get the client object from the global registry binding callbacks. But it can be called several times with same client object. And even if A client creates display object, (so there is a connection), The server could not know that. There could be more use-cases not only for this. Giulio: a test is added for the new functionality Signed-off-by: Sung-jae Park <nicesj@nicesj.com> Signed-off-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-08-09 18:46:51 +08:00
compositor_introspection_test_SOURCES = tests/compositor-introspection-test.c
compositor_introspection_test_LDADD = libtest-runner.la
Add API to install protocol loggers on the server wl_display The new wl_display_add_protocol_logger allows to set a function as a logger, which will get called when a new request is received or an event is sent. This is akin to setting WAYLAND_DEBUG=1, but more powerful because it can be enabled at run time and allows to show the log e.g. in a UI view. A test is added for the new functionality. Signed-off-by: Giulio Camuffo <giulio.camuffo@kdab.com> Reviewed-by: Jonas Ådahl <jadahl@gmail.com> Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
2016-08-12 15:33:06 +08:00
protocol_logger_test_SOURCES = tests/protocol-logger-test.c
protocol_logger_test_LDADD = libtest-runner.la
tests: add an headers test This test checks that the protocol and library headers include only what they are supposed to include. That is, that the core headers do not include the protocol headers and that the core protocol headers do not include the non core library headers. The build process now generates core protocol headers, but they are only used in the test and don't get installed. Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2015-05-22 01:43:13 +08:00
headers_test_SOURCES = tests/headers-test.c \
tests/headers-protocol-test.c \
tests/headers-protocol-core-test.c
nodist_headers_test_SOURCES = \
protocol/wayland-server-protocol-core.h \
protocol/wayland-client-protocol-core.h
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
tests: C++ compilation test This test includes one of wayland headers, which produced error with C++ compiler. C compiler can't be used for this test, because it issues only a warning[1] and only when wayland headers are not installed in system headers path (/usr/include). [1] wayland-server-protocol.h:201:2: warning: implicit declaration of function ‘wl_resource_post_event’ [daniels: Merged in Marek's follow-up to check for a C++ compiler.] Signed-off-by: Mariusz Ceier <mceier+wayland@gmail.com> Signed-off-by: Marek Chalupa <mchqwerty@gmail.com> Reviewed-by: Daniel Stone <daniels@collabora.com>
2014-12-15 18:33:53 +08:00
if ENABLE_CPP_TEST
cpp_compile_test_SOURCES = tests/cpp-compile-test.cpp
endif
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
fixed_benchmark_SOURCES = tests/fixed-benchmark.c
Add $(RT_LIBS) to fixed-benchmark LD dependencies `tests/fixed-benchmark.c` calls `clock_gettime`.
2019-09-16 08:02:30 +08:00
fixed_benchmark_LDADD = $(RT_LIBS)
build: Move tests/Makefile.am into toplevel Makefile.am
2014-03-07 16:00:18 +08:00
os_wrappers_test_SOURCES = tests/os-wrappers-test.c
os_wrappers_test_LDADD = libtest-runner.la
exec_fd_leak_checker_SOURCES = tests/exec-fd-leak-checker.c
tests: fix main symbol duplication So far I got these errors before patching: libtool: link: cc -o .libs/headers-test -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/headers-test.o tests/headers-protocol-test.o tests/headers-protocol-core-test.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at headers-test.c:53 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/headers-test.c:53) >>> tests/headers-test.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a libtool: link: cc -o .libs/exec-fd-leak-checker -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/exec-fd-leak-checker.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at exec-fd-leak-checker.c:57 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/exec-fd-leak-checker.c:57) >>> tests/exec-fd-leak-checker.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a Makefile.am: error: object 'tests/test-helpers.$(OBJEXT)' created both with libtool and without libtool: link: cc -o .libs/fixed-benchmark -pthread -Wall -Wextra -Wno-unused-parameter -g -Wstrict-prototypes -Wmissing-prototypes -fvisibility=hidden -O2 -pipe tests/fixed-benchmark.o /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a -L.libs -lwayland-client -lffi -lm -lwayland-server -lkvm -Wl,-rpath-link,/usr/local/lib ld: error: duplicate symbol: main >>> defined at fixed-benchmark.c:100 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/fixed-benchmark.c:100) >>> tests/fixed-benchmark.o:(main) >>> defined at test-runner.c:377 (/tmp/obj/wayland-1.16.0/wayland-1.16.0/tests/test-runner.c:377) >>> test-runner.o:(.text+0x250) in archive /tmp/obj/wayland-1.16.0/build-amd64/.libs/libtest-runner.a This commit fixes all of that. Signed-off-by: Leonid Bobrov <mazocomp@disroot.org> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
2019-02-13 19:39:06 +08:00
exec_fd_leak_checker_LDADD = libtest-helpers.la
tests: add scanner tests Add tests that ensure that wayland-scanner output for a given input does not change unexpectedly. This makes it very easy to review wayland-scanner patches. Before, when patches were proposed for wayland-scanner, I had to build wayland without the patches, save the generated files into a temporary directory, apply the patches, build again, and diff the old vs. new generated file. No more. Now whenever someone makes intentional changes to wayland-scanner's output, he will also have to patch the example output files to match. That means that reviewers see the diff of the generated files straight from the patch itself. Verifying the diff is true is as easy as 'make check'. The tests use separate example XML files instead of wayland.xml directly, so that wayland.xml can be updated without fixing scanner tests, avoiding the churn. example.xml starts as a copy of wayland.xml. If wayland.xml starts using new wayland-scanner features, they should be copied into example.xml again to be covered by the tests. This patch relies on the previous patch to actually add all the data files for input and reference output. The scanner output is fed through sed to remove parts that are allowed to vary: the scanner version string. v2: no need for scanner-test.sh to depend on the test data Task: https://phabricator.freedesktop.org/T3313 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> (v1) Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Tested-by: Yong Bakos <ybakos@humanoriented.com>
2016-09-30 20:12:47 +08:00
build: wire-up wayland-egl Wire-up the imported sources, test and pkg-config files. v2: - Don't mangle with existing EXTRA_DIST list - Add the symbols check script to the `make check' target - Rename wayland-egl-{priv,backend}.h Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Arnaud Vrac <avrac@freebox.fr>
2017-10-10 21:43:48 +08:00
EXTRA_DIST += tests/scanner-test.sh \
tests: Add missing file to distribution In f74c9b98db49ce16e037c3012590c4a24a4fc32e I added tests.xml to the repository, but not to the distribution tarball. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net> Reviewed-by: Daniel Stone <daniels@collabora.com>
2018-01-20 01:51:35 +08:00
protocol/tests.xml \
tests: Verify that wayland_scanner can catch bad identifiers The test runs wayland_scanner on a set of XML protocol files which have malformed element names, and confirms that an error is produced and indicates the correct line. Copyright notifications are not included in the test files, as they are not code; of course, the project license still applies. Signed-off-by: Manuel Stoeckl <code@mstoeckl.com>
2019-04-14 06:33:06 +08:00
tests/data/bad-identifier-arg.xml \
tests/data/bad-identifier-entry.xml \
tests/data/bad-identifier-enum.xml \
tests/data/bad-identifier-event.xml \
tests/data/bad-identifier-interface.xml \
tests/data/bad-identifier-protocol.xml \
tests/data/bad-identifier-request.xml \
tests: add scanner tests Add tests that ensure that wayland-scanner output for a given input does not change unexpectedly. This makes it very easy to review wayland-scanner patches. Before, when patches were proposed for wayland-scanner, I had to build wayland without the patches, save the generated files into a temporary directory, apply the patches, build again, and diff the old vs. new generated file. No more. Now whenever someone makes intentional changes to wayland-scanner's output, he will also have to patch the example output files to match. That means that reviewers see the diff of the generated files straight from the patch itself. Verifying the diff is true is as easy as 'make check'. The tests use separate example XML files instead of wayland.xml directly, so that wayland.xml can be updated without fixing scanner tests, avoiding the churn. example.xml starts as a copy of wayland.xml. If wayland.xml starts using new wayland-scanner features, they should be copied into example.xml again to be covered by the tests. This patch relies on the previous patch to actually add all the data files for input and reference output. The scanner output is fed through sed to remove parts that are allowed to vary: the scanner version string. v2: no need for scanner-test.sh to depend on the test data Task: https://phabricator.freedesktop.org/T3313 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> (v1) Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Tested-by: Yong Bakos <ybakos@humanoriented.com>
2016-09-30 20:12:47 +08:00
tests/data/example.xml \
tests/data/example-client.h \
tests/data/example-server.h \
tests/data/example-code.c \
tests/data/small.xml \
tests/data/small-code.c \
tests/data/small-client.h \
tests/data/small-server.h \
tests/data/small-code-core.c \
tests/data/small-client-core.h \
tests: add code, public-code and private-code tests First one is deprecated in favour of the second option. The latter is newly introduced and annotates the generated symbols accordingly. v2: Don't introduce small-public-code.c - reuse small-code.c (Pekka) Cc: Pekka Paalanen <ppaalanen@gmail.com> Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
2018-02-22 19:23:39 +08:00
tests/data/small-server-core.h \
autotools: add Meson files to EXTRA_DIST This allows users to build Wayland with Meson from an autotools-generated release tarball. Signed-off-by: Simon Ser <contact@emersion.fr> Closes: https://gitlab.freedesktop.org/wayland/wayland/issues/141
2020-02-04 22:15:20 +08:00
tests/data/small-private-code.c \
meson.build \
meson_options.txt \
cursor/meson.build \
doc/meson.build \
doc/doxygen/mainpage.dox \
doc/doxygen/meson.build \
doc/doxygen/gen-doxygen.py \
doc/doxygen/xml/meson.build \
doc/doxygen/xml/Client/meson.build \
doc/doxygen/xml/Server/meson.build \
doc/man/meson.build \
doc/publican/meson.build \
doc/publican/sources/meson.build \
egl/meson.build \
src/meson.build \
tests/meson.build
tests: add scanner tests Add tests that ensure that wayland-scanner output for a given input does not change unexpectedly. This makes it very easy to review wayland-scanner patches. Before, when patches were proposed for wayland-scanner, I had to build wayland without the patches, save the generated files into a temporary directory, apply the patches, build again, and diff the old vs. new generated file. No more. Now whenever someone makes intentional changes to wayland-scanner's output, he will also have to patch the example output files to match. That means that reviewers see the diff of the generated files straight from the patch itself. Verifying the diff is true is as easy as 'make check'. The tests use separate example XML files instead of wayland.xml directly, so that wayland.xml can be updated without fixing scanner tests, avoiding the churn. example.xml starts as a copy of wayland.xml. If wayland.xml starts using new wayland-scanner features, they should be copied into example.xml again to be covered by the tests. This patch relies on the previous patch to actually add all the data files for input and reference output. The scanner output is fed through sed to remove parts that are allowed to vary: the scanner version string. v2: no need for scanner-test.sh to depend on the test data Task: https://phabricator.freedesktop.org/T3313 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> (v1) Reviewed-by: Yong Bakos <ybakos@humanoriented.com> Tested-by: Yong Bakos <ybakos@humanoriented.com>
2016-09-30 20:12:47 +08:00
tests/scanner-test.sh: $(top_builddir)/wayland-scanner
clean-local:
-rm -rf tests/output
build: Build libwayland-private This splits the bulk of libwayland-util into libwayland-private. libwayland-util (which is just wayland-util.c) is for use with the scanner. libwayland-private is everything else. Most things will want to link both libs. Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-06-19 06:47:22 +08:00
endif #ENABLE_LIBRARIES
Reference in New Issue Copy Permalink