tests: disable nouveau if unavailable

This commit is contained in:
Maarten Lankhorst 2012-08-24 22:55:20 +02:00
parent 425940be1d
commit dd8325323b
2 changed files with 10 additions and 2 deletions

View File

@ -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)

View File

@ -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 ...