From 0475afe8e1c20509799b8e41ebad64938315e630 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Mon, 9 Jan 2017 14:52:22 -0500 Subject: [PATCH 6/6] skip tests that cannot pass with pure-c dispatch glvnd will not actually work 100% with pure-c dispatch.. but this at least removes expected make-check fails so that it can be built. --- tests/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index fb8408f..e413d5b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -56,7 +56,9 @@ AM_CFLAGS = \ -I$(top_srcdir)/src/util/glvnd_pthread +if ! GLDISPATCH_TYPE_PURE_C TESTS += testpatchentrypoints_gldispatch.sh +endif check_PROGRAMS += testpatchentrypoints_gldispatch testpatchentrypoints_gldispatch_SOURCES = \ testpatchentrypoints_gldispatch.c @@ -74,6 +76,7 @@ testpatchentrypoints_gldispatch_LDADD += $(top_builddir)/src/util/libutils_misc. # the scripts would be missing when you run "make dist" or "make distcheck". TESTS_GLX = +if ! GLDISPATCH_TYPE_PURE_C TESTS_GLX += testglxmcbasic.sh TESTS_GLX += testglxmcloop.sh TESTS_GLX += testglxmcthreads.sh @@ -81,9 +84,12 @@ TESTS_GLX += testglxmclate.sh TESTS_GLX += testglxmcoldlink.sh TESTS_GLX += testglxgetprocaddress.sh TESTS_GLX += testglxgetprocaddress_genentry.sh +endif TESTS_GLX += testglxgetclientstr.sh TESTS_GLX += testglxqueryversion.sh +if ! GLDISPATCH_TYPE_PURE_C TESTS_GLX += testpatchentrypoints.sh +endif if ENABLE_GLX -- 2.9.3