diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-08-24 22:55:20 +0200 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-08-24 22:55:20 +0200 |
| commit | dd8325323bfcca1f742e864ca7d87101a0d59936 (patch) | |
| tree | edc288a7bb529d652a9ce2a9e370bf6519601153 | |
| parent | 425940be1d894459cead9aaf211a74338480aaa3 (diff) | |
tests: disable nouveau if unavailable
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 74aa101..ddc59fd 100644 --- a/configure.ac +++ b/configure.ac @@ -60,7 +60,9 @@ PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.38 libdrm]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) # for dma-buf tests -PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33]) +PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33], nouveau=yes, nouveau=no) + +AM_CONDITIONAL(BUILD_NOUVEAU, [test "x$nouveau" != xno]) # for testdisplay PKG_CHECK_MODULES(CAIRO, cairo) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9f8c798..282d55c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -71,11 +71,17 @@ TESTS_progs = \ gem_ctx_bad_exec \ gem_ctx_basic \ gem_reg_read \ + prime_self_import \ + $(NULL) + +if BUILD_NOUVEAU +TESTS_progs += \ prime_nv_api \ prime_nv_pcopy \ prime_nv_test \ - prime_self_import \ $(NULL) +endif + # IMPORTANT: The ZZ_ tests need to be run last! # ... and make can't deal with inlined comments ... |