KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emil Velikov 2016-04-20 23:10:00 +01:00 committed by Emil Velikov
parent f3cb0dcae1
commit 3ee7d8b0eb
3 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -2637,7 +2637,6 @@ AC_CONFIG_FILES([Makefile
src/intel/genxml/Makefile
src/intel/isl/Makefile
src/intel/vulkan/Makefile
src/intel/vulkan/tests/Makefile
src/loader/Makefile
src/mapi/Makefile
src/mapi/es1api/glesv1_cm.pc

17
src/intel/vulkan/Makefile.am
View File

@ -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)

47
src/intel/vulkan/tests/Makefile.am
View File

@ -1,47 +0,0 @@
# Copyright © 2009 Intel Corporation
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# on the rights to use, copy, modify, merge, publish, distribute, sub
# license, and/or sell copies of the Software, and to permit persons to whom
# the Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice (including the next
# paragraph) shall be included in all copies or substantial portions of the
# Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
AM_CPPFLAGS = \
$(INTEL_CFLAGS) \
$(VALGRIND_CFLAGS) \
$(DEFINES) \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mesa/drivers/dri/common \
-I$(top_srcdir)/src/mesa/drivers/dri/i965 \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/intel \
-I$(top_srcdir)/src/intel/vulkan \
-I$(top_builddir)/src/intel/vulkan
LDADD = \
$(top_builddir)/src/intel/vulkan/libvulkan-test.la \
$(PTHREAD_LIBS) -lm -lstdc++
check_PROGRAMS = \
block_pool_no_free \
state_pool_no_free \
state_pool_free_list_only \
state_pool
TESTS = $(check_PROGRAMS)