From 8ae3b244fcbc207b51a81514e51008fe64d13368 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Fri, 2 Feb 2018 15:39:17 +0000 Subject: [build] include test/unit/Makefile rather than recursive build FIXME: unit tests are not currently run as part of make check. --- Makefile.in | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 31d428d9b..146ed558a 100644 --- 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),) -- cgit v1.2.1