diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-01-23 13:49:01 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-01-29 11:10:58 +0100 |
| commit | 998e0a4aedf10fb5f7c271018cd80d874668bf55 (patch) | |
| tree | 6fb434d79be03b70a463cdcf2da9779a166b6931 | |
| parent | 434af38f8d19c61fdcfa611644c29dbe73f9f3a9 (diff) | |
automake: Remove VC4/V3D build support
Eric is using meson nowadays.
v2: Fix up the test filter, meson lists now contain more than in the
automake lists.
Cc: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Acked-by: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | lib/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/Makefile.am | 6 | ||||
| -rw-r--r-- | tests/Makefile.sources | 17 |
5 files changed, 1 insertions, 40 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 289a8fca..4bd4130f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,7 @@ test:test-list-diff: - build:tests-debian-autotools - build:tests-debian-meson stage: test - script: diff <(sed "s/ /\n/g" meson-test-list.txt| sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort) + script: diff <(sed "s/ /\n/g" meson-test-list.txt| grep -v 'vc4\|v3d' | sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort) ################### DEPLOY ######################### diff --git a/configure.ac b/configure.ac index c677575d..b46f024f 100644 --- a/configure.ac +++ b/configure.ac @@ -238,14 +238,6 @@ if test "x$NOUVEAU" = xyes; then fi AM_CONDITIONAL(HAVE_LIBDRM_NOUVEAU, [test "x$NOUVEAU" = xyes]) -AC_ARG_ENABLE(vc4, AS_HELP_STRING([--disable-vc4], - [Enable building of vc4 tests (default: yes)]), - [VC4=$enableval], [VC4=yes]) -if test "x$VC4" = xyes; then - AC_DEFINE(BUILD_VC4, 1, [Have vc4 support]) -fi -AM_CONDITIONAL(BUILD_VC4, [test "x$VC4" = xyes]) - # enable debug symbols AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug], @@ -309,7 +301,6 @@ AC_CONFIG_FILES([ tools/Makefile tools/null_state_gen/Makefile tools/registers/Makefile - include/Makefile overlay/Makefile ]) diff --git a/lib/Makefile.am b/lib/Makefile.am index f0bf6459..3b88e339 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -14,13 +14,6 @@ libigt_perf_la_SOURCES = \ noinst_LTLIBRARIES = libintel_tools.la libigt_perf.la noinst_HEADERS = check-ndebug.h -if BUILD_VC4 - libintel_tools_la_SOURCES += \ - igt_vc4.c \ - igt_vc4.h \ - vc4_packet.h -endif - if !HAVE_LIBDRM_INTEL libintel_tools_la_SOURCES += \ stubs/drm/intel_bufmgr.c \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 2f399ce3..2e0d1f85 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,12 +10,6 @@ if HAVE_LIBDRM_NOUVEAU TESTS_progs += $(NOUVEAU_TESTS) endif -if BUILD_VC4 - TESTS_progs += $(VC4_TESTS) -endif - -TESTS_progs += $(V3D_TESTS) - if HAVE_CHAMELIUM TESTS_progs += \ kms_chamelium \ diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 2ad63fe8..34b7e445 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -4,23 +4,6 @@ NOUVEAU_TESTS = \ prime_nv_test \ $(NULL) -VC4_TESTS = \ - vc4_create_bo \ - vc4_dmabuf_poll \ - vc4_lookup_fail \ - vc4_label_bo \ - vc4_purgeable_bo \ - vc4_tiling \ - vc4_wait_bo \ - vc4_wait_seqno \ - $(NULL) - -V3D_TESTS = \ - v3d_get_bo_offset \ - v3d_get_param \ - v3d_mmap \ - $(NULL) - AMDGPU_TESTS = \ amdgpu/amd_basic \ amdgpu/amd_cs_nop \ |