[postgis-tickets] r17758 - Split "check" into "check-regress" and "check-unit"
Sandro Santilli
strk at kbt.io
Thu Aug 22 06:37:00 PDT 2019
Author: strk
Date: 2019-08-22 06:36:59 -0700 (Thu, 22 Aug 2019)
New Revision: 17758
Modified:
trunk/GNUmakefile.in
trunk/deps/Makefile.in
trunk/doc/Makefile.in
trunk/extensions/Makefile.in
trunk/liblwgeom/Makefile.in
trunk/libpgcommon/Makefile.in
trunk/loader/Makefile.in
trunk/postgis/Makefile.in
trunk/raster/Makefile.in
trunk/raster/test/Makefile.in
trunk/regress/Makefile.in
trunk/topology/Makefile.in
trunk/topology/test/Makefile.in
trunk/utils/Makefile.in
Log:
Split "check" into "check-regress" and "check-unit"
Makes "installcheck" only run "check-regress"
Closes #4487
Modified: trunk/GNUmakefile.in
===================================================================
--- trunk/GNUmakefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/GNUmakefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -16,7 +16,7 @@
PERL = @PERL@
# todo: add more rules here, like uninstall, clean...
-all install uninstall noop clean distclean check:
+all install uninstall noop clean distclean check-unit check-regress:
for s in $(SUBDIRS); do \
echo "---- Making $@ in $${s}"; \
$(MAKE) -C $${s} $@ || exit 1; \
@@ -39,7 +39,7 @@
# TODO: drop 'test' target..
test: check
-check: all docs-check check-no-trailing-blanks
+check: all docs-check check-no-trailing-blanks check-unit check-regress
check-no-trailing-blanks:
! find . -name '*.c' -o -name '*.h' -o -name '*.proto' | \
@@ -53,7 +53,7 @@
installcheck: installcheck-base installcheck-upgrade
installcheck-base:
- RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
+ RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check-regress
# only run upgrade test if RUNTESTFLAGS was not already doing that
installcheck-upgrade: installcheck-upgrade-byfunc
@@ -60,7 +60,7 @@
if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)" \
- $(MAKE) check; \
+ $(MAKE) check-regress; \
fi
# only run upgrade test if RUNTESTFLAGS was not already doing that
@@ -68,7 +68,7 @@
if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)!" \
- $(MAKE) check; \
+ $(MAKE) check-regress; \
fi
distclean: distclean-local
Modified: trunk/deps/Makefile.in
===================================================================
--- trunk/deps/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/deps/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -40,7 +40,7 @@
uninstall:
-check:
+check check-unit check-regress:
clean:
$(MAKE) -C wagyu $@
Modified: trunk/doc/Makefile.in
===================================================================
--- trunk/doc/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/doc/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -420,10 +420,13 @@
+check: check-unit
+check-regress:
+
ifeq ($(XMLLINT),)
-check: requirements_not_met_xmllint
+check-unit: requirements_not_met_xmllint
else
-check: $(XML_INPUTS)
+check-unit: $(XML_INPUTS)
$(XMLLINT) --loaddtd --xinclude --valid postgis-out.xml > /dev/null
endif
Modified: trunk/extensions/Makefile.in
===================================================================
--- trunk/extensions/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/extensions/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -37,6 +37,6 @@
rm -f Makefile
-check:
+check check-unit check-regress:
@echo "Nothing to check"
Modified: trunk/liblwgeom/Makefile.in
===================================================================
--- trunk/liblwgeom/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/liblwgeom/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -193,7 +193,11 @@
rm -f liblwgeom.h Makefile
rm -f Makefile
-check: liblwgeom.la
+check: check-unit
+
+check-regress:
+
+check-unit: liblwgeom.la
$(MAKE) -C cunit check
# Command to build each of the .lo files
Modified: trunk/libpgcommon/Makefile.in
===================================================================
--- trunk/libpgcommon/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/libpgcommon/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -53,7 +53,11 @@
$(MAKE) -C cunit distclean
rm -f Makefile
-check: libpgcommon.a
+check: check-unit
+
+check-regress:
+
+check-unit: libpgcommon.a
$(MAKE) -C cunit check
# Command to build each of the .o files
Modified: trunk/loader/Makefile.in
===================================================================
--- trunk/loader/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/loader/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -153,7 +153,11 @@
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(SHP2PGSQL-CLI)"
$(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(bindir)/$(SHP2PGSQL-GUI)"
-check:
+# TODO: move here what's currently run from regress/loader and
+# regress/dumper ?
+check-regress:
+
+check-unit:
$(MAKE) -C cunit check
clean:
Modified: trunk/postgis/Makefile.in
===================================================================
--- trunk/postgis/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/postgis/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -271,4 +271,8 @@
distclean: clean
rm -f Makefile
+check-unit:
+
+check-regress:
+
maintainer-clean: distclean
Modified: trunk/raster/Makefile.in
===================================================================
--- trunk/raster/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/raster/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -62,8 +62,5 @@
$(MAKE) -C scripts $@
rm -f raster_config.h Makefile
-core-check:
+check check-unit check-regress core-check:
$(MAKE) -C test $@
-
-check:
- $(MAKE) -C test $@
Modified: trunk/raster/test/Makefile.in
===================================================================
--- trunk/raster/test/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/raster/test/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -11,10 +11,14 @@
all: check
-core-check:
+check: check-unit check-regress
+
+core-check: check-unit
+
+check-unit:
$(MAKE) -C cunit check
-check: core-check
+check-regress:
$(MAKE) -C regress check
clean:
Modified: trunk/regress/Makefile.in
===================================================================
--- trunk/regress/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/regress/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -39,7 +39,11 @@
all install uninstall:
-check: staged-install
+check: check-regress
+
+check-unit:
+
+check-regress: staged-install
$(MAKE) -C core check
ifeq ($(HAVE_SFCGAL),yes)
$(MAKE) -C sfcgal check
Modified: trunk/topology/Makefile.in
===================================================================
--- trunk/topology/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/topology/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -133,10 +133,12 @@
uninstall_topology.sql: topology.sql ../utils/create_undef.pl
$(PERL) ../utils/create_undef.pl $< $(POSTGIS_PGSQL_VERSION) > $@
-check-local: topology.sql
- $(MAKE) -C test check
+check-unit:
-check: check-local
+check-regress: topology.sql
+ $(MAKE) -C test $@
+check: check-regress
+
distclean: clean
rm -f Makefile test/Makefile
Modified: trunk/topology/test/Makefile.in
===================================================================
--- trunk/topology/test/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/topology/test/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -84,7 +84,9 @@
TESTS_EXPECTED = $(TESTS:.sql=_expected)
-check: topo_predicates.sql load_topology.sql load_topology-4326.sql $(TESTS) $(TESTS_EXPECTED)
+check: check-regress
+
+check-regress: topo_predicates.sql load_topology.sql load_topology-4326.sql $(TESTS) $(TESTS_EXPECTED)
$(MAKE) -C ../../regress staged-install
$(PERL) ../../regress/run_test.pl --topology $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
Modified: trunk/utils/Makefile.in
===================================================================
--- trunk/utils/Makefile.in 2019-08-22 12:13:42 UTC (rev 17757)
+++ trunk/utils/Makefile.in 2019-08-22 13:36:59 UTC (rev 17758)
@@ -77,4 +77,4 @@
rm -f Makefile
# And there's nothing to check
-check:
+check check-unit check-regress:
More information about the postgis-tickets
mailing list