Remove the "EGL/GLX have different pointers" tests

The correct answer for systems with different EGL and GLX driver
implementations is to use GLVND.`

Closes #165

test/Makefile.am

@@ -65,7 +65,6 @@ TESTS = \
 check_BINARIES = $(EGL_AND_GLX_BIN)
 
 XFAIL_TESTS = \
-        egl_and_glx_different_pointers_egl_glx \
 	$()
 
 check_PROGRAMS = $(TESTS)
@@ -99,9 +98,6 @@ if BUILD_GLX
 if HAVE_DLVSYM
 EGL_AND_GLX_TESTS = \
 	egl_gl \
-	egl_and_glx_different_pointers_egl_glx \
-	egl_and_glx_different_pointers_egl \
-	egl_and_glx_different_pointers_glx \
         $()
 endif
 endif
@@ -153,21 +149,6 @@ egl_gles2_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=2
 egl_gles2_without_glx_SOURCES = egl_without_glx.c
 egl_gles2_without_glx_LDADD = $(EPOXY) $(DLOPEN_LIBS) libegl_common.la $(X11_LIBS)
 
-egl_and_glx_different_pointers_egl_SOURCES = egl_and_glx_different_pointers.c dlwrap.c dlwrap.h
-egl_and_glx_different_pointers_egl_LDADD = libegl_common.la libglx_common.la $(DLOPEN_LIBS) $(EPOXY) $(X11_LIBS)
-egl_and_glx_different_pointers_egl_LDFLAGS = -rdynamic
-egl_and_glx_different_pointers_egl_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_EGL
-
-egl_and_glx_different_pointers_glx_SOURCES = egl_and_glx_different_pointers.c dlwrap.c dlwrap.h
-egl_and_glx_different_pointers_glx_LDADD = libegl_common.la libglx_common.la $(DLOPEN_LIBS) $(EPOXY) $(X11_LIBS)
-egl_and_glx_different_pointers_glx_LDFLAGS = -rdynamic
-egl_and_glx_different_pointers_glx_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_GLX
-
-egl_and_glx_different_pointers_egl_glx_SOURCES = egl_and_glx_different_pointers.c dlwrap.c dlwrap.h
-egl_and_glx_different_pointers_egl_glx_LDADD = libegl_common.la libglx_common.la $(DLOPEN_LIBS) $(EPOXY) $(X11_LIBS)
-egl_and_glx_different_pointers_egl_glx_LDFLAGS = -rdynamic
-egl_and_glx_different_pointers_egl_glx_CPPFLAGS = $(AM_CPPFLAGS) -DUSE_EGL -DUSE_GLX
-
 glx_alias_prefer_same_name_SOURCES = glx_alias_prefer_same_name.c dlwrap.c dlwrap.h
 glx_alias_prefer_same_name_LDFLAGS = -rdynamic
 glx_alias_prefer_same_name_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) $(DLOPEN_LIBS)

test/meson.build

@@ -116,41 +116,6 @@ if build_glx
       test(test_name, test_bin)
     endif
   endforeach
-
-  if has_dlvsym
-    # GLX/EGL tests
-    if build_egl
-      glx_egl_sources = [
-        'egl_and_glx_different_pointers.c',
-        'dlwrap.c',
-        'dlwrap.h',
-      ]
-
-      glx_egl_deps = [ libepoxy_dep, x11_dep, dl_dep ]
-      glx_egl_link_flags = [ '-rdynamic' ]
-      glx_egl_link_with = [ glx_common_lib, egl_common_lib ]
-
-      glx_egl_tests = [
-        [ 'egl_and_glx_different_pointers_glx', [ '-DUSE_GLX' ], false ],
-        [ 'egl_and_glx_different_pointers_egl', [ '-DUSE_EGL' ], false ],
-        [ 'egl_and_glx_different_pointers_egl_glx', [ '-DUSE_EGL', '-DUSE_GLX' ], true ],
-      ]
-
-      foreach test: glx_egl_tests
-        test_name = test[0]
-        test_c_args = test[1]
-        test_should_fail = test[2]
-
-        test_bin = executable(test_name, glx_egl_sources,
-                              c_args: common_cflags + test_c_args,
-                              include_directories: libepoxy_inc,
-                              dependencies: glx_egl_deps,
-                              link_with: glx_egl_link_with,
-                              link_args: glx_egl_link_flags)
-        test(test_name, test_bin, should_fail: test_should_fail)
-      endforeach
-    endif
-  endif
 endif
 
 # WGL