summaryrefslogtreecommitdiffstats
path: root/src/intel/vulkan/Makefile.am
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2016-04-20 23:10:00 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2016-05-01 08:38:04 +0100
commit3ee7d8b0eb9324b56ea9386e3c1d2925eaaaa225 (patch)
tree2325cb59fba66276cae516e6dfcb59d293ba1301 /src/intel/vulkan/Makefile.am
parentf3cb0dcae14ceb3fd614f36d39886d9cecc0c0e5 (diff)
downloadexternal_mesa3d-3ee7d8b0eb9324b56ea9386e3c1d2925eaaaa225.zip
external_mesa3d-3ee7d8b0eb9324b56ea9386e3c1d2925eaaaa225.tar.gz
external_mesa3d-3ee7d8b0eb9324b56ea9386e3c1d2925eaaaa225.tar.bz2
anv: fold the tests' makefile
Recent commit removed the winsys defines from anv_private.h thus breaking the tests. To fix that and avoid it in the future, merge the tests makefile in the libvulkan one. Signed-off-by: Emil Velikov <emil.velikov@collabora.com> Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Diffstat (limited to 'src/intel/vulkan/Makefile.am')
-rw-r--r--src/intel/vulkan/Makefile.am17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index 40775ec..c7baf17 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -21,8 +21,6 @@
include Makefile.sources
-SUBDIRS = . tests
-
vulkan_includedir = $(includedir)/vulkan
vulkan_include_HEADERS = \
@@ -158,3 +156,18 @@ libvulkan_test_la_SOURCES = $(VULKAN_GEM_STUB_FILES)
libvulkan_test_la_LIBADD = $(libvulkan_intel_la_LIBADD)
include $(top_srcdir)/install-lib-links.mk
+
+noinst_HEADERS = \
+ tests/state_pool_test_helper.h
+
+LDADD = \
+ libvulkan-test.la \
+ $(PTHREAD_LIBS) -lm -lstdc++
+
+check_PROGRAMS = \
+ tests/block_pool_no_free \
+ tests/state_pool_no_free \
+ tests/state_pool_free_list_only \
+ tests/state_pool
+
+TESTS = $(check_PROGRAMS)