Commit 082a07d2 authored by Sandro Santilli's avatar Sandro Santilli

Have "installcheck" also test CREATE EXTENSION from unpackaged

Closes #4205

git-svn-id: http://svn.osgeo.org/postgis/trunk@16928 b70326c6-7e19-0410-871a-916f4a2858ee
parent 87297f00
Pipeline #33531272 passed with stage
in 31 minutes and 3 seconds
......@@ -9,6 +9,10 @@ ifeq (@LIBLWGEOM_ONLY@,no)
SUBDIRS += libpgcommon postgis regress @RASTER@ @TOPOLOGY@ loader utils doc @EXTENSIONS@
endif
POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
PERL = @PERL@
# todo: add more rules here, like uninstall, clean...
......@@ -45,9 +49,19 @@ check-no-trailing-blanks:
grep -v postgis/sqldefines.h | \
xargs grep -n '[[:space:]]$$'
installcheck:
installcheck: installcheck-base installcheck-upgrade
installcheck-base:
RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
# only run upgrade test if RUNTESTFLAGS was not already doing that
installcheck-upgrade:
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; \
fi
distclean: distclean-local
distclean-local: clean-local
......
......@@ -181,6 +181,6 @@ check:
$(MAKE) -C ../../../regress staged-install
$(PERL) ../../../regress/run_test.pl --raster $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
$(PERL) ../../../regress/run_test.pl --upgrade --raster $(RUNTESTFLAGS) $(TESTS); \
fi
......@@ -301,7 +301,7 @@ staged-install: staged-install-raster staged-install-topology
test check: staged-install
$(PERL) run_test.pl $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
$(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS); \
fi
......
......@@ -77,6 +77,6 @@ check: topo_predicates.sql load_topology.sql load_topology-4326.sql $(TESTS) $(T
$(MAKE) -C ../../regress staged-install
$(PERL) ../../regress/run_test.pl --topology $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
$(PERL) ../../regress/run_test.pl --upgrade --topology $(RUNTESTFLAGS) $(TESTS); \
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment