diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-04-20 23:10:00 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-01 08:38:04 +0100 |
| commit | 3ee7d8b0eb9324b56ea9386e3c1d2925eaaaa225 (patch) | |
| tree | 2325cb59fba66276cae516e6dfcb59d293ba1301 /src/intel/vulkan/tests | |
| parent | f3cb0dcae14ceb3fd614f36d39886d9cecc0c0e5 (diff) | |
| download | external_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/tests')
| -rw-r--r-- | src/intel/vulkan/tests/Makefile.am | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/src/intel/vulkan/tests/Makefile.am b/src/intel/vulkan/tests/Makefile.am deleted file mode 100644 index ddff73c..0000000 --- a/src/intel/vulkan/tests/Makefile.am +++ /dev/null @@ -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) |