diff options
| author | Eric Anholt <eric@anholt.net> | 2017-11-10 12:39:56 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2017-11-21 09:52:52 -0800 |
| commit | d21e95ca81da6f9332999ceebe6b42e4425d3bb6 (patch) | |
| tree | ec5ea9f9fb7aba73bbed7836be9d7668e3a45b6b /tests | |
| parent | 4eb53c7cc02a36a23c33f786cb20bf078719f40e (diff) | |
tests: Remove libdrm_vc4 dependency.
The autotools build retains the configure.ac option, while meson folds
vc4 into the default build since we don't have any meson_options.txt
to control parts of the build.
Signed-off-by: Eric Anholt <eric@anholt.net>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/meson.build | 16 |
2 files changed, 6 insertions, 22 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 3cf5af3a..81e320c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,7 @@ if HAVE_LIBDRM_NOUVEAU TESTS_progs += $(NOUVEAU_TESTS) endif -if HAVE_LIBDRM_VC4 +if BUILD_VC4 TESTS_progs += $(VC4_TESTS) endif @@ -143,16 +143,6 @@ prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS) prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS) -vc4_create_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_create_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_lookup_fail_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_lookup_fail_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_dmabuf_poll_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_dmabuf_poll_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_wait_bo_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_wait_bo_LDADD = $(LDADD) $(DRM_VC4_LIBS) -vc4_wait_seqno_CFLAGS = $(AM_CFLAGS) $(DRM_VC4_CFLAGS) -vc4_wait_seqno_LDADD = $(LDADD) $(DRM_VC4_LIBS) kms_chamelium_CFLAGS = $(AM_CFLAGS) $(XMLRPC_CFLAGS) $(LIBUDEV_CFLAGS) kms_chamelium_LDADD = $(LDADD) $(XMLRPC_LIBS) $(LIBUDEV_LIBS) diff --git a/tests/meson.build b/tests/meson.build index 20ff79dc..eb64f959 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -213,6 +213,11 @@ test_progs = [ 'syncobj_wait', 'template', 'tools_test', + 'vc4_create_bo', + 'vc4_dmabuf_poll', + 'vc4_lookup_fail', + 'vc4_wait_bo', + 'vc4_wait_seqno', 'vgem_basic', 'vgem_slow', ] @@ -238,17 +243,6 @@ if libdrm_nouveau.found() test_deps += libdrm_nouveau endif -if libdrm_vc4.found() - test_progs += [ - 'vc4_create_bo', - 'vc4_dmabuf_poll', - 'vc4_lookup_fail', - 'vc4_wait_bo', - 'vc4_wait_seqno', - ] - test_deps += libdrm_vc4 -endif - if chamelium.found() test_progs += [ 'kms_chamelium', |