Disable the dlwrap-based tests on apple.

We'd need a dlvsym() equivalent.
macos/v1.5.9
Eric Anholt 11 years ago
parent 3e09de7550
commit 756dcaf6a5
  1. 6
      configure.ac
  2. 12
      test/Makefile.am

@ -80,6 +80,7 @@ case $host_os in
build_egl=no build_egl=no
build_glx=yes build_glx=yes
build_wgl=no build_wgl=no
build_apple=yes
has_znow=no has_znow=no
EPOXY_LINK_LIBS="" EPOXY_LINK_LIBS=""
;; ;;
@ -110,6 +111,11 @@ if test x$build_wgl = xyes; then
AC_DEFINE([BUILD_WGL], [1], [build WGL tests]) AC_DEFINE([BUILD_WGL], [1], [build WGL tests])
fi fi
AM_CONDITIONAL(BUILD_APPLE, test x$build_apple = xyes)
if test x$build_apple = xyes; then
AC_DEFINE([BUILD_APPLE], [1], [build APPLE is apple (for testing)])
fi
AM_CONDITIONAL(HAS_ZNOW, test x$has_znow = xyes) AM_CONDITIONAL(HAS_ZNOW, test x$has_znow = xyes)
AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"]) AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])

@ -85,6 +85,7 @@ endif
if BUILD_EGL if BUILD_EGL
if BUILD_GLX if BUILD_GLX
if !BUILD_APPLE
EGL_AND_GLX_TESTS = \ EGL_AND_GLX_TESTS = \
egl_and_glx_different_pointers_egl_glx \ egl_and_glx_different_pointers_egl_glx \
egl_and_glx_different_pointers_egl \ egl_and_glx_different_pointers_egl \
@ -92,17 +93,24 @@ EGL_AND_GLX_TESTS = \
$() $()
endif endif
endif endif
endif
GLX_TESTS = \ if !BUILD_APPLE
GLX_NON_APPLE_TESTS = \
glx_alias_prefer_same_name \ glx_alias_prefer_same_name \
glx_gles2 \
$()
endif
GLX_TESTS = \
glx_beginend \ glx_beginend \
glx_public_api \ glx_public_api \
glx_public_api_core \ glx_public_api_core \
glx_gles2 \
glx_glxgetprocaddress_nocontext \ glx_glxgetprocaddress_nocontext \
glx_has_extension_nocontext \ glx_has_extension_nocontext \
glx_static \ glx_static \
$(GLX_SHARED_ZNOW) \ $(GLX_SHARED_ZNOW) \
$(GLX_NON_APPLE_TESTS) \
$() $()
GLX_LIBS = libglx_common.la GLX_LIBS = libglx_common.la

Loading…
Cancel
Save