summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-12-04 19:07:36 -0800
committerEric Anholt <eric@anholt.net>2013-12-04 19:22:13 -0800
commitde70a2a0abfade6fa3fb4876f4c90e3715e9b70f (patch)
treeb6803aed6c8327485930dcee7b0228101adf1483 /test
parent7603c144db3a5f880f6ce56ccf9eca6c27dc4d70 (diff)
Fix a similar bug to HEAD~2, this time in epoxy_has_glx_extension().
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am2
-rw-r--r--test/glx_has_extension_nocontext.c4
-rw-r--r--test/glx_public_api.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index e282f3f..81263b0 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,8 +38,6 @@ TESTS = \
headerguards \
$()
-XFAIL_TESTS = glx_has_extension_nocontext
-
check_PROGRAMS = $(TESTS)
glx_public_api_LDFLAGS = $(X11_LIBS) $(EPOXY) libglx_common.la
diff --git a/test/glx_has_extension_nocontext.c b/test/glx_has_extension_nocontext.c
index 5aeaa4e..2f87ac3 100644
--- a/test/glx_has_extension_nocontext.c
+++ b/test/glx_has_extension_nocontext.c
@@ -46,10 +46,10 @@ main(int argc, char **argv)
dpy = get_display_or_skip();
- if (!epoxy_has_glx_extension("GLX_ARB_get_proc_address"))
+ if (!epoxy_has_glx_extension(dpy, 0, "GLX_ARB_get_proc_address"))
errx(1, "Implementation reported absence of GLX_ARB_get_proc_address");
- if (epoxy_has_glx_extension("GLX_ARB_ham_sandwich"))
+ if (epoxy_has_glx_extension(dpy, 0, "GLX_ARB_ham_sandwich"))
errx(1, "Implementation reported presence of GLX_ARB_ham_sandwich");
return pass != true;
diff --git a/test/glx_public_api.c b/test/glx_public_api.c
index e89a4a4..e38d260 100644
--- a/test/glx_public_api.c
+++ b/test/glx_public_api.c
@@ -91,14 +91,14 @@ test_glx_version(void)
static bool
test_glx_extension_supported(void)
{
- if (!epoxy_has_glx_extension("GLX_ARB_get_proc_address")) {
+ if (!epoxy_has_glx_extension(dpy, 0, "GLX_ARB_get_proc_address")) {
fprintf(stderr,
"Incorrectly reported no support for GLX_ARB_get_proc_address "
"(should always be present in Linux ABI)\n");
return false;
}
- if (epoxy_has_glx_extension("GLX_EXT_ham_sandwich")) {
+ if (epoxy_has_glx_extension(dpy, 0, "GLX_EXT_ham_sandwich")) {
fprintf(stderr,
"Incorrectly reported support for GLX_EXT_ham_sandwich\n");
return false;