Commit 87297f00 authored by Sandro Santilli's avatar Sandro Santilli

Do not run upgrade tests twice

Somehow closes #4201

git-svn-id: http://svn.osgeo.org/postgis/trunk@16927 b70326c6-7e19-0410-871a-916f4a2858ee
parent a078fdba
Pipeline #33505605 passed with stage
in 23 minutes and 15 seconds
......@@ -140,7 +140,7 @@ TEST_SREL = \
rt_samealignment \
rt_geos_relationships \
rt_iscoveragetile
TEST_BUGS = \
bug_test_car5 \
permitted_gdal_drivers \
......@@ -177,7 +177,10 @@ rtpostgis.sql: ../../rt_pg/rtpostgis.sql
$(PERL) -lpe "s'\\\$$libdir'$(REGRESS_INSTALLDIR)/lib'g" $< > $@
check:
check:
$(MAKE) -C ../../../regress staged-install
$(PERL) ../../../regress/run_test.pl --raster $(RUNTESTFLAGS) $(TESTS)
$(PERL) ../../../regress/run_test.pl --upgrade --raster $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
$(PERL) ../../../regress/run_test.pl --upgrade --raster $(RUNTESTFLAGS) $(TESTS); \
fi
......@@ -299,8 +299,11 @@ staged-install: staged-install-raster staged-install-topology
#$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install
test check: staged-install
$(PERL) run_test.pl $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS) && \
$(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS)
$(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 \
$(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS); \
fi
garden:
createdb postgis_garden
......
......@@ -76,4 +76,7 @@ TESTS_EXPECTED = $(TESTS:.sql=_expected)
check: 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)
$(PERL) ../../regress/run_test.pl --upgrade --topology $(RUNTESTFLAGS) $(TESTS)
# only run upgrade test if RUNTESTFLAGS was not already doing that
if test -z `echo "$(RUNTESTFLAGS)" | grep -- --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