summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2012-05-21 19:23:48 -0700
committerKenneth Graunke <[email protected]>2012-05-30 21:49:41 -0700
commita44ccdc8760fdbd5ba5c01ffff3809fbfb364934 (patch)
tree468cbb77590300d8467e6852c5217561b794cccc
parent1559b2e2d7c0d9ddab0e186fcf855ea847152ef1 (diff)
ralloc: Add some basic unit tests.
I started writing unit tests for a new piece of code, and discovered they all failed due to a bug in ralloc. Clearly it needs a test suite. v2: Rename to 'ralloc-test' and fix copyright date. (idr review) Signed-off-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/glsl/tests/.gitignore1
-rw-r--r--src/glsl/tests/Makefile.am5
-rw-r--r--src/glsl/tests/ralloc_test.cpp38
3 files changed, 44 insertions, 0 deletions
diff --git a/src/glsl/tests/.gitignore b/src/glsl/tests/.gitignore
index 4f984b09778..654d8a5692e 100644
--- a/src/glsl/tests/.gitignore
+++ b/src/glsl/tests/.gitignore
@@ -1,2 +1,3 @@
Makefile
+ralloc_test
uniform-initializer-test
diff --git a/src/glsl/tests/Makefile.am b/src/glsl/tests/Makefile.am
index 7fcd9f61314..c1c74e75b57 100644
--- a/src/glsl/tests/Makefile.am
+++ b/src/glsl/tests/Makefile.am
@@ -9,9 +9,11 @@ AM_CXXFLAGS = $(INC)
TESTS = \
optimization-test \
+ ralloc-test \
uniform-initializer-test
check_PROGRAMS = \
+ ralloc-test \
uniform-initializer-test
uniform_initializer_test_SOURCES = \
@@ -24,3 +26,6 @@ uniform_initializer_test_LDADD = \
$(top_builddir)/src/glsl/libglsl.a \
$(top_builddir)/src/mesa/libmesa.a \
-lpthread
+
+ralloc_test_SOURCES = ralloc_test.cpp $(top_builddir)/src/glsl/ralloc.c
+ralloc_test_LDADD = $(top_builddir)/src/gtest/libgtest.la -lpthread
diff --git a/src/glsl/tests/ralloc_test.cpp b/src/glsl/tests/ralloc_test.cpp
new file mode 100644
index 00000000000..c0a870a8104
--- /dev/null
+++ b/src/glsl/tests/ralloc_test.cpp
@@ -0,0 +1,38 @@
+/*
+ * 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));
+}
+/*@}*/