diff options
| author | Kyle Brenneman <kbrenneman@nvidia.com> | 2016-03-28 17:44:05 -0600 |
|---|---|---|
| committer | Kyle Brenneman <kbrenneman@nvidia.com> | 2016-03-28 17:44:05 -0600 |
| commit | d7f4370dde9b67c8b5a8a4fd3a3df4507ba7f879 (patch) | |
| tree | e62e3cfbe6a874181785847b79ae7e5d666f860c /tests | |
| parent | 95a5bfcdfbc3c38e201e81d6497efe6c7b97f72b (diff) | |
| parent | 1d7ab91b76d0fbefaff4f4b8c7d019cbd18c9ff9 (diff) | |
Merge pull request #79 from kbrenneman/replace-x11glvnd-v2.
Replace x11glvnd with GLX_EXT_libglvnd extension.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 5d2ab01..2703656 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,41 +41,44 @@ TESTS = \ testglxmcloop.sh \ testglxmcthreads.sh \ testglxmclate.sh \ - testx11glvndproto.sh \ testglxmcoldlink.sh \ testglxgetclientstr.sh \ testglxqueryversion.sh \ - testglxnscreens.sh \ testglxnscrthreads.sh \ testpatchentrypoints.sh \ fini_test_env.sh +# TODO: These tests depend on the x11glvnd server extension, which isn't used +# anymore. They need to be rewritten to use the GLX_EXT_libglvnd extension +# instead. +#TESTS += testx11glvndproto.sh +#TESTS += testglxnscreens.sh + EXTRA_DIST = $(TESTS) check_PROGRAMS = \ testglxgetprocaddress \ testglxmakecurrent \ testglxmakecurrent_oldlink \ - testx11glvndproto \ testglxgetclientstr \ testglxqueryversion \ - testpatchentrypoints \ - testglxnscreens + testpatchentrypoints + +#check_PROGRAMS += testx11glvndproto +#check_PROGRAMS += testglxnscreens testglxnscreens_SOURCES = \ $(top_srcdir)/src/util/glvnd_pthread.c \ testglxnscreens.c \ test_utils.c -X11GLVND_DIR = src/x11glvnd - -testglxnscreens_CFLAGS = -I$(top_srcdir)/$(X11GLVND_DIR) $(AM_CFLAGS) - -testglxnscreens_LDADD = -lX11 -testglxnscreens_LDADD += $(top_builddir)/src/GLX/libGLX.la -testglxnscreens_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la -testglxnscreens_LDADD += $(top_builddir)/src/util/trace/libtrace.la -testglxnscreens_LDADD += -lX11 -ldl $(top_builddir)/$(X11GLVND_DIR)/libx11glvnd_client.la +#testglxnscreens_CFLAGS = -I$(top_srcdir)/$(X11GLVND_DIR) $(AM_CFLAGS) +# +#testglxnscreens_LDADD = -lX11 +#testglxnscreens_LDADD += $(top_builddir)/src/GLX/libGLX.la +#testglxnscreens_LDADD += $(top_builddir)/src/OpenGL/libOpenGL.la +#testglxnscreens_LDADD += $(top_builddir)/src/util/trace/libtrace.la +#testglxnscreens_LDADD += -lX11 -ldl $(top_builddir)/$(X11GLVND_DIR)/libx11glvnd_client.la # The *_oldlink variant tests that linking against legacy libGL.so works @@ -94,8 +97,8 @@ testglxmakecurrent_oldlink_LDADD = -lX11 -ldl testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/GL/libGL.la testglxmakecurrent_oldlink_LDADD += $(top_builddir)/src/util/trace/libtrace.la -testx11glvndproto_CFLAGS = -I$(top_srcdir)/$(X11GLVND_DIR) -testx11glvndproto_LDADD = -lX11 $(top_builddir)/$(X11GLVND_DIR)/libx11glvnd_client.la +#testx11glvndproto_CFLAGS = -I$(top_srcdir)/$(X11GLVND_DIR) +#testx11glvndproto_LDADD = -lX11 $(top_builddir)/$(X11GLVND_DIR)/libx11glvnd_client.la # Disable annoying "unused" errors AM_CFLAGS = \ |