summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2012-11-27 19:18:25 +0100
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-01-10 22:01:30 +0100
commitcb4d5021c66d3067d592ce07d77373cf956c8459 (patch)
tree23c7612575cf272d36d1682043585a85f9472814
parent59088a2c2cf2b2a8bfaf19ae6440ea827c891d9d (diff)
gallium/tests/unit: Convert to automake
-rw-r--r--configure.ac3
-rw-r--r--src/gallium/tests/unit/Makefile49
-rw-r--r--src/gallium/tests/unit/Makefile.am34
3 files changed, 36 insertions, 50 deletions
diff --git a/configure.ac b/configure.ac
index fd7cefd0a95..9553e13a03e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1753,7 +1753,7 @@ dnl
dnl Gallium Tests
dnl
if test "x$enable_gallium_tests" = xyes; then
- SRC_DIRS="$SRC_DIRS gallium/tests/trivial"
+ SRC_DIRS="$SRC_DIRS gallium/tests/trivial gallium/tests/unit"
enable_gallium_loader=yes
fi
@@ -2101,6 +2101,7 @@ AC_CONFIG_FILES([configs/current
src/gallium/targets/xvmc-r600/Makefile
src/gallium/targets/xvmc-softpipe/Makefile
src/gallium/tests/trivial/Makefile
+ src/gallium/tests/unit/Makefile
src/gallium/winsys/Makefile
src/gallium/winsys/i915/drm/Makefile
src/gallium/winsys/i915/sw/Makefile
diff --git a/src/gallium/tests/unit/Makefile b/src/gallium/tests/unit/Makefile
deleted file mode 100644
index bb3039f3bc7..00000000000
--- a/src/gallium/tests/unit/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# progs/gallium/simple/Makefile
-
-TOP = ../../../..
-include $(TOP)/configs/current
-
-INCLUDES = \
- -I. \
- -I$(TOP)/src/gallium/include \
- -I$(TOP)/src/gallium/auxiliary \
- -I$(TOP)/src/gallium/drivers \
- -I$(TOP)/src/gallium/winsys \
- $(PROG_INCLUDES)
-
-LINKS = \
- $(TOP)/src/gallium/drivers/trace/libtrace.a \
- $(TOP)/src/gallium/winsys/sw/null/libws_null.a \
- $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
- $(GALLIUM_AUXILIARIES) \
- $(PROG_LINKS)
-
-SOURCES = \
- pipe_barrier_test.c \
- u_cache_test.c \
- u_half_test.c \
- u_format_test.c \
- u_format_compatible_test.c \
- translate_test.c
-
-
-OBJECTS = $(SOURCES:.c=.o)
-
-PROGS = $(OBJECTS:.o=)
-
-##### TARGETS #####
-
-default: $(PROGS)
-
-clean:
- -rm -f $(PROGS)
- -rm -f *.o
- -rm -f result.bmp
-
-##### RULES #####
-
-$(OBJECTS): %.o: %.c
- $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $(PROG_DEFINES) $< -o $@
-
-$(PROGS): %: %.o
- $(CC) $(LDFLAGS) $< $(LINKS) -lm -lpthread -ldl -o $@
diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am
new file mode 100644
index 00000000000..c157cc026da
--- /dev/null
+++ b/src/gallium/tests/unit/Makefile.am
@@ -0,0 +1,34 @@
+# TODO: wire up some useful tests to make check
+
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+ $(GALLIUM_CFLAGS)
+
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/src/gallium/drivers \
+ -I$(top_srcdir)/src/gallium/winsys
+
+LDADD = \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+ $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
+ $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
+ $(DLOPEN_LIBS) \
+ $(PTHREAD_LIBS) \
+ -lm
+
+noinst_PROGRAMS = pipe_barrier_test u_cache_test u_half_test \
+ u_format_test u_format_compatible_test translate_test
+
+pipe_barrier_test_SOURCES = pipe_barrier_test.c
+
+u_cache_test_SOURCES = u_cache_test.c
+
+u_half_test_SOURCES = u_half_test.c
+
+u_format_test_SOURCES = u_format_test.c
+
+u_format_compatible_test_SOURCES = u_format_compatible_test.c
+
+translate_test_SOURCES = translate_test.c