diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/util/Makefile.am | 30 | ||||
| -rw-r--r-- | src/util/tests/Makefile.am | 42 | ||||
| -rw-r--r-- | src/util/tests/ralloc_test.cpp | 38 |
4 files changed, 5 insertions, 106 deletions
diff --git a/configure.ac b/configure.ac index a3b3abdd4b0..f311419d892 100644 --- a/configure.ac +++ b/configure.ac @@ -2280,7 +2280,6 @@ AC_CONFIG_FILES([Makefile src/mesa/drivers/x11/Makefile src/mesa/main/tests/Makefile src/util/Makefile - src/util/tests/Makefile src/util/tests/hash_table/Makefile]) dnl Sort the dirs alphabetically diff --git a/src/util/Makefile.am b/src/util/Makefile.am index e738ab08d2f..4733a1a74c5 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -19,14 +19,10 @@ # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -SUBDIRS = . tests +SUBDIRS = . tests/hash_table include Makefile.sources -BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) - -CLEANFILES = $(BUILT_SOURCES) - noinst_LTLIBRARIES = libmesautil.la libmesautil_la_CPPFLAGS = \ @@ -36,26 +32,10 @@ libmesautil_la_CPPFLAGS = \ libmesautil_la_SOURCES = \ $(MESA_UTIL_FILES) \ - $(MESA_UTIL_GENERATED_FILES) + $(MESA_UTIL_GENERATED_FILES) + +BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) +CLEANFILES = $(BUILT_SOURCES) format_srgb.c: $(srcdir)/format_srgb.py $(AM_V_GEN) $(PYTHON2) $< > $@ - -### Tests: - -CFLAGS_FOR_TESTS = $(PTHREAD_CFLAGS) -CPPFLAGS_FOR_TESTS = \ - $(libmesautil_la_CPPFLAGS) \ - -I$(top_srcdir)/src/gtest/include -LDADD_FOR_TESTS = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) - -TESTS = tests/ralloc_test -check_PROGRAMS = $(TESTS) - -tests_ralloc_test_SOURCES = tests/ralloc_test.cpp -tests_ralloc_test_CFLAGS = $(CFLAGS_FOR_TESTS) -tests_ralloc_test_CPPFLAGS = $(CPPFLAGS_FOR_TESTS) -tests_ralloc_test_LDADD = $(LDADD_FOR_TESTS) diff --git a/src/util/tests/Makefile.am b/src/util/tests/Makefile.am deleted file mode 100644 index 8ec8c3aa55c..00000000000 --- a/src/util/tests/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2014 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 -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# 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 NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS 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. - -SUBDIRS = hash_table - -AM_CFLAGS = \ - $(PTHREAD_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/util \ - -I$(top_srcdir)/src/mesa \ - -I$(top_srcdir)/src/gtest/include \ - $(DEFINES) $(INCLUDE_DIRS) - -LDADD = \ - $(top_builddir)/src/gtest/libgtest.la \ - $(top_builddir)/src/util/libmesautil.la \ - $(PTHREAD_LIBS) - -TESTS = ralloc_test -check_PROGRAMS = $(TESTS) - -ralloc_test_SOURCES = ralloc_test.cpp diff --git a/src/util/tests/ralloc_test.cpp b/src/util/tests/ralloc_test.cpp deleted file mode 100644 index c0a870a8104..00000000000 --- a/src/util/tests/ralloc_test.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright © 2012 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 - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * 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 NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS 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. - */ -#include <gtest/gtest.h> -#include <string.h> - -#include "ralloc.h" - -/** - * \name Basic functionality - */ -/*@{*/ -TEST(ralloc_test, null_parent) -{ - void *mem_ctx = ralloc_context(NULL); - - EXPECT_EQ(NULL, ralloc_parent(mem_ctx)); -} -/*@}*/ |