[build] include test/unit/Makefile rather than recursive build

FIXME: unit tests are not currently run as part of make check.

diff --git a/Makefile.in b/Makefile.in
index 31d428d9bbe21a7f730b5e11f64d20dd21b74b49..146ed558acc6859dcb102099effb49cc02f05e8d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -212,28 +212,7 @@ endif
 endif
 
 ifeq ("$(TESTING)", "yes")
-# testing and report generation
-RUBY=ruby1.9 -Ireport-generators/lib -Ireport-generators/test
-
-.PHONY: unit-test ruby-test test-programs
-
-# FIXME: put dependencies on libdm and liblvm
-# FIXME: Should be handled by Makefiles in subdirs, not here at top level.
-test-programs:
-       cd unit-tests/regex && $(MAKE)
-       cd unit-tests/datastruct && $(MAKE)
-       cd unit-tests/mm && $(MAKE)
-
-unit-test: test-programs
-       $(RUBY) report-generators/unit_test.rb $(shell find . -name TESTS)
-       $(RUBY) report-generators/title_page.rb
-
-memcheck: test-programs
-       $(RUBY) report-generators/memcheck.rb $(shell find . -name TESTS)
-       $(RUBY) report-generators/title_page.rb
-
-ruby-test:
-       $(RUBY) report-generators/test/ts.rb
+include test/unit/Makefile
 endif
 
 ifneq ($(shell which ctags),)

diff --git a/test/Makefile.in b/test/Makefile.in
index 230ce5bb6276f4dc79fce60cfbaf3142b8c1a795..097b2fa213f6f62be69f06318841f02a678d8a4f 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -27,7 +27,7 @@ datarootdir = @datarootdir@
 
 LVM_TEST_RESULTS ?= results
 
-SUBDIRS = api unit
+SUBDIRS = api
 SOURCES = lib/not.c lib/harness.c
 CXXSOURCES = lib/runner.cpp
 CXXFLAGS += $(EXTRA_EXEC_CFLAGS)

diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in
index 5cf92ba100d055942b96dce307ce669b4e6427e1..2e2c81935530afe280b7fb0a72515fecca6bb704 100644 (file)
--- a/test/unit/Makefile.in
+++ b/test/unit/Makefile.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2011-2017 Red Hat, Inc. All rights reserved.
+# Copyright (C) 2011-2018 Red Hat, Inc. All rights reserved.
 #
 # This file is part of LVM2.
 #
@@ -10,44 +10,24 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = @top_builddir@
-
-VPATH = $(srcdir)
-UNITS = \
-       bcache_t.c \
-       bitset_t.c\
-       config_t.c\
-       dmlist_t.c\
-       dmstatus_t.c\
-       matcher_t.c\
-       percent_t.c\
-       string_t.c\
-       run.c
-
-ifeq ("@TESTING@", "yes")
-SOURCES = $(UNITS)
-TARGETS = run
-endif
-
-include $(top_builddir)/make.tmpl
-
-ifeq ($(MAKECMDGOALS),distclean)
-SOURCES = $(UNITS)
-endif
-
-ifeq ("$(TESTING)", "yes")
-LDLIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio @CUNIT_LIBS@
-CFLAGS += @CUNIT_CFLAGS@
-
-check: unit
-
-$(TARGETS): $(OBJECTS) $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
+UNIT_SOURCE=\
+       test/unit/bcache_t.c \
+       test/unit/bitset_t.c\
+       test/unit/config_t.c\
+       test/unit/dmlist_t.c\
+       test/unit/dmstatus_t.c\
+       test/unit/matcher_t.c\
+       test/unit/percent_t.c\
+       test/unit/string_t.c\
+       test/unit/run.c
+UNIT_OBJECTS=$(UNIT_SOURCE:%.c=%.o)
+
+UNIT_LDLIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio -lcunit
+
+test/unit/run: $(UNIT_OBJECTS) libdm/libdevmapper.$(LIB_SUFFIX) lib/liblvm-internal.a
        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \
-             -o $@ $(OBJECTS) $(LDLIBS)
+             -o $@ $(UNIT_OBJECTS) $(UNIT_LDLIBS)
 
-unit: $(TARGETS) $(top_builddir)/lib/liblvm-internal.a
+unit-test: test/unit/run
        @echo Running unit tests
-       LD_LIBRARY_PATH=$(top_builddir)/libdm ./$(TARGETS)
-endif
+       LD_LIBRARY_PATH=libdm test/unit/run