From 3ee7d8b0eb9324b56ea9386e3c1d2925eaaaa225 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 20 Apr 2016 23:10:00 +0100 Subject: 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 Acked-by: Jason Ekstrand --- src/intel/vulkan/Makefile.am | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'src/intel/vulkan/Makefile.am') 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) -- cgit v1.1