support "make check" in src/ subdirs for unit-testing of just that module; also suppo...

diff --git a/Makefile b/Makefile
index 43fd2e3b1464b3339f4a7ca6df4aa0b863a67028..061f3d8d1e9cc59de3e2c366656b32c760dbd2f2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,3 +13,7 @@ all %:
                echo 'Run configure first, or type "make" in a configured build directory.'; \
                echo; \
        fi
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/Makefile.subdir b/Makefile.subdir
index 6470510d9826fd5ed2626e0178195d8e0327da3d..1ac8357f6adaa0ffb41f9a9997c58325cf500717 100644 (file)
--- a/Makefile.subdir
+++ b/Makefile.subdir
@@ -1,6 +1,8 @@
 # -*-makefile-*-
 include $(topdir)/builds/current
 builddir = $(topdir)/builds/$(CURRENT_BUILD)/$(srcdir)
+unittestdir = $(topdir)/builds/$(CURRENT_BUILD)/test/unit
+unittestprefix = $(srcdir:src/%=%)
 
 .PHONY: _default_build_ all
 _default_build_: all
@@ -15,3 +17,21 @@ all %:
                echo 'Run configure first, or type "make" in a configured build directory.'; \
                echo; \
        fi
+
+.PHONY: check
+check:
+       @if test -e $(unittestdir); then \
+               echo cd $(unittestdir); \
+               cd $(unittestdir); \
+               echo $(MAKE) TEST_PREFIX=$(unittestprefix)/ $@; \
+               $(MAKE) TEST_PREFIX=$(unittestprefix)/ $@; \
+       else \
+               echo; \
+               echo "** ERROR: could not find unit testing dir \`$(unittestdir)'"; \
+               echo; \
+               exit 1; \
+       fi
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/Makefile b/test/Makefile
index ba9d1278856247374510beb5a3156fc69c497ff6..fa1dcec3aaa55daa9cff50c418ee136df2ab3635 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,3 +2,7 @@ topdir = ..
 srcdir = test
 
 include $(topdir)/Makefile.subdir
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/Makefile.am b/test/Makefile.am
index 2be47b41b53eaad1fb3a2d252b519c43e9ed2350..13f12edf7837965c3cf327d2a4277f49607421ee 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1 +1,5 @@
 SUBDIRS = unit system regress
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/Makefile.in b/test/Makefile.in
index 6e8fff2a7f44260d5f89694a907e88d2bdefcad2..ceda17330cbe378140b8369327372d612af4f09b 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -578,6 +578,10 @@ uninstall-am:
        uninstall uninstall-am
 
 
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/test/regress/Makefile b/test/regress/Makefile
index 2946f5217a18bf26f1b470b4a6c3705a57d15f2f..06fe0f1fbd898188c9fc7b0dad6b7881fa8f8940 100644 (file)
--- a/test/regress/Makefile
+++ b/test/regress/Makefile
@@ -2,3 +2,7 @@ topdir = ../..
 srcdir = test/regress
 
 include $(topdir)/Makefile.subdir
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/regress/Makefile.am b/test/regress/Makefile.am
index c59885975109b0aef90a86178deea3989f13eb39..953db9bfd09ea9420664c2b82f32c26048f072a5 100644 (file)
--- a/test/regress/Makefile.am
+++ b/test/regress/Makefile.am
@@ -35,3 +35,7 @@ TESTS = \
        wiki.cvc \
        logops.cvc \
        comb2.shuffled-as.sat03-420.smt
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/regress/Makefile.in b/test/regress/Makefile.in
index 0db9d000412f3b08502cca3cd985c2b33a376474..b194b219fb04fc6a127c95feb3959f30ac8f92f6 100644 (file)
--- a/test/regress/Makefile.in
+++ b/test/regress/Makefile.in
@@ -509,6 +509,10 @@ uninstall-am:
        uninstall uninstall-am
 
 
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/test/system/Makefile b/test/system/Makefile
new file mode 100644 (file)
index 0000000..c1dc3ef
--- /dev/null
+++ b/test/system/Makefile
@@ -0,0 +1,8 @@
+topdir = ../..
+srcdir = test/system
+
+include $(topdir)/Makefile.subdir
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/system/Makefile.am b/test/system/Makefile.am
index a12adc56be263abf5d2ce7ce0456a1ce5220e9c5..5e9cca17a51fdc4e83df1d1566af9ea90ae681ba 100644 (file)
--- a/test/system/Makefile.am
+++ b/test/system/Makefile.am
@@ -24,3 +24,7 @@ EXTRA_DIST = \
 
 # rebuild tests if a library changes
 $(TESTS):: $(TEST_DEPS)
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/system/Makefile.in b/test/system/Makefile.in
index 2496a1849d35016cea8586ddada61b2738eba12f..82a1b6ef4dd854f4ee09f90aca8641c7f31eddbf 100644 (file)
--- a/test/system/Makefile.in
+++ b/test/system/Makefile.in
@@ -498,6 +498,10 @@ uninstall-am:
 # rebuild tests if a library changes
 $(TESTS):: $(TEST_DEPS)
 
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/test/unit/Makefile b/test/unit/Makefile
index 190a41bb0c972bf1e1aa0c1f88208d7652acaf0c..b8a801378e20b32b3517a1cbc34b298b777d09fe 100644 (file)
--- a/test/unit/Makefile
+++ b/test/unit/Makefile
@@ -2,3 +2,7 @@ topdir = ../..
 srcdir = test/unit
 
 include $(topdir)/Makefile.subdir
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
index f2fb9be92257a6901b6fc97366086bee97a00593..dfe345afe958a0c4965f328151439023c4603e6c 100644 (file)
--- a/test/unit/Makefile.am
+++ b/test/unit/Makefile.am
@@ -80,3 +80,7 @@ EXTRA_DIST = \
        $(TEST_DEPS_DIST)
 
 endif
+
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check

diff --git a/test/unit/Makefile.in b/test/unit/Makefile.in
index 9486634783c0aca0340ed66d57ff550a842dd91c..bc7928b3bed2b028407fcf93a1e6cf8a82624707 100644 (file)
--- a/test/unit/Makefile.in
+++ b/test/unit/Makefile.in
@@ -675,6 +675,10 @@ uninstall-am:
 @HAVE_CXXTESTGEN_TRUE@ $(LTCXXCOMPILE) $(AM_CXXFLAGS_PUBLIC) -c -o $@.lo $<
 @HAVE_CXXTESTGEN_TRUE@ $(CXXLINK) $(AM_LDFLAGS_PUBLIC) $@.lo
 
+# synonyms for "check"
+.PHONY: regress regress0 regress1 regress2 regress3 test
+regress regress0 regress1 regress2 regress3 test: check
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/test/unit/Makefile.tests b/test/unit/Makefile.tests
index fcd748d0d53c041893ca97edeaa636bd9d57eb95..c542259b1441fefc5d9ee7cf43fa52782d0d9cea 100644 (file)
--- a/test/unit/Makefile.tests
+++ b/test/unit/Makefile.tests
@@ -1,3 +1,5 @@
+TESTS := $(filter $(TEST_PREFIX)%,$(TESTS))
+
 WHITE_TESTS = $(filter %_white,$(TESTS))
 BLACK_TESTS = $(filter %_black,$(TESTS))
 PUBLIC_TESTS = $(filter %_public,$(TESTS))