flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-07-25 10:55:58 +00:00
Code Issues Releases Wiki Activity

Revert "tests: disable nouveau if unavailable"

Browse Source 
This reverts commit dd8325323bfcca1f742e864ca7d87101a0d59936.

I like the patch from Alan Coopersmith with an explicit disable
option better.
This commit is contained in:
Daniel Vetter 2012-08-24 23:18:48 +02:00
parent dd8325323b
commit e40146878e
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -60,9 +60,7 @@ PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.38 libdrm])
PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
# for dma-buf tests # for dma-buf tests
PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33], nouveau=yes, nouveau=no) PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
AM_CONDITIONAL(BUILD_NOUVEAU, [test "x$nouveau" != xno])
# for testdisplay # for testdisplay
PKG_CHECK_MODULES(CAIRO, cairo) PKG_CHECK_MODULES(CAIRO, cairo)

8
tests/Makefile.am
View File

@ -71,17 +71,11 @@ TESTS_progs = \
gem_ctx_bad_exec \ gem_ctx_bad_exec \
gem_ctx_basic \ gem_ctx_basic \
gem_reg_read \ gem_reg_read \
prime_self_import \
$(NULL)
if BUILD_NOUVEAU
TESTS_progs += \
prime_nv_api \ prime_nv_api \
prime_nv_pcopy \ prime_nv_pcopy \
prime_nv_test \ prime_nv_test \
prime_self_import \
$(NULL) $(NULL)
endif
# IMPORTANT: The ZZ_ tests need to be run last! # IMPORTANT: The ZZ_ tests need to be run last!
# ... and make can't deal with inlined comments ... # ... and make can't deal with inlined comments ...