diff options
| author | Andreas Boll <andreas.boll.dev@gmail.com> | 2012-11-27 19:18:25 +0100 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2012-12-06 11:53:39 +0100 |
| commit | d491eb0b67b09bf603a42f075bbacc279c4416d1 (patch) | |
| tree | 5ae26fac87379a90f934cd82ddaee6ebcf6490cb | |
| parent | 15e0a857d5924d12821567984302e89f2e1e15b9 (diff) | |
gallium/tests/unit: Convert to automake
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/gallium/tests/unit/Makefile | 49 | ||||
| -rw-r--r-- | src/gallium/tests/unit/Makefile.am | 34 |
3 files changed, 36 insertions, 50 deletions
diff --git a/configure.ac b/configure.ac index 6ad94555c6..a904d9422f 100644 --- a/configure.ac +++ b/configure.ac @@ -1732,7 +1732,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 @@ -2080,6 +2080,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 bb3039f3bc..0000000000 --- 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 0000000000..c157cc026d --- /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 |