diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-24 23:18:48 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-08-24 23:18:48 +0200 |
| commit | e40146878e4cf74a96fd0c42342065f7cd85fa97 (patch) | |
| tree | 0079a9cfd00234c696ddd4272fbe2635f26851a1 | |
| parent | dd8325323bfcca1f742e864ca7d87101a0d59936 (diff) | |
Revert "tests: disable nouveau if unavailable"
This reverts commit dd8325323bfcca1f742e864ca7d87101a0d59936.
I like the patch from Alan Coopersmith with an explicit disable
option better.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index ddc59fd5d..74aa10126 100644 --- a/configure.ac +++ b/configure.ac @@ -60,9 +60,7 @@ 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], nouveau=yes, nouveau=no) - -AM_CONDITIONAL(BUILD_NOUVEAU, [test "x$nouveau" != xno]) +PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33]) # for testdisplay PKG_CHECK_MODULES(CAIRO, cairo) diff --git a/tests/Makefile.am b/tests/Makefile.am index 282d55c5c..9f8c79843 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -71,17 +71,11 @@ 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 ... |