diff options
| author | Eric Anholt <eric@anholt.net> | 2014-03-28 16:38:19 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2014-03-28 16:45:26 -0700 |
| commit | 756dcaf6a5e07ead098457efba15f5be75bf2123 (patch) | |
| tree | 87741b9bac92d289aa5ff5c3788d0f917d04ab96 | |
| parent | 3e09de7550cd901b8d3ecbf27e0128f0dc0f0b99 (diff) | |
| download | libepoxy-756dcaf6a5e07ead098457efba15f5be75bf2123.tar.gz | |
Disable the dlwrap-based tests on apple.
We'd need a dlvsym() equivalent.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | test/Makefile.am | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1218e38..df7ee89 100644 --- a/configure.ac +++ b/configure.ac @@ -80,6 +80,7 @@ case $host_os in build_egl=no build_glx=yes build_wgl=no + build_apple=yes has_znow=no EPOXY_LINK_LIBS="" ;; @@ -110,6 +111,11 @@ if test x$build_wgl = xyes; then AC_DEFINE([BUILD_WGL], [1], [build WGL tests]) 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) AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"]) diff --git a/test/Makefile.am b/test/Makefile.am index 5a8c49a..7e43dd7 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -85,6 +85,7 @@ endif if BUILD_EGL if BUILD_GLX +if !BUILD_APPLE EGL_AND_GLX_TESTS = \ egl_and_glx_different_pointers_egl_glx \ egl_and_glx_different_pointers_egl \ @@ -92,17 +93,24 @@ EGL_AND_GLX_TESTS = \ $() endif endif +endif -GLX_TESTS = \ +if !BUILD_APPLE +GLX_NON_APPLE_TESTS = \ glx_alias_prefer_same_name \ + glx_gles2 \ + $() +endif + +GLX_TESTS = \ glx_beginend \ glx_public_api \ glx_public_api_core \ - glx_gles2 \ glx_glxgetprocaddress_nocontext \ glx_has_extension_nocontext \ glx_static \ $(GLX_SHARED_ZNOW) \ + $(GLX_NON_APPLE_TESTS) \ $() GLX_LIBS = libglx_common.la |