[postgis-tickets] r16927 - Do not run upgrade tests twice

[Sandro Santilli]

Author: strk
Date: 2018-10-18 15:36:34 -0700 (Thu, 18 Oct 2018)
New Revision: 16927

Modified:
   trunk/raster/test/regress/Makefile.in
   trunk/regress/Makefile.in
   trunk/topology/test/Makefile.in
Log:
Do not run upgrade tests twice

Somehow closes #4201

Modified: trunk/raster/test/regress/Makefile.in
===================================================================
--- trunk/raster/test/regress/Makefile.in	2018-10-18 22:16:41 UTC (rev 16926)
+++ trunk/raster/test/regress/Makefile.in	2018-10-18 22:36:34 UTC (rev 16927)
@@ -140,7 +140,7 @@
 	rt_samealignment \
 	rt_geos_relationships \
 	rt_iscoveragetile
-	
+
 TEST_BUGS = \
 	bug_test_car5 \
 	permitted_gdal_drivers \
@@ -177,7 +177,10 @@
 	$(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

Modified: trunk/regress/Makefile.in
===================================================================
--- trunk/regress/Makefile.in	2018-10-18 22:16:41 UTC (rev 16926)
+++ trunk/regress/Makefile.in	2018-10-18 22:36:34 UTC (rev 16927)
@@ -299,8 +299,11 @@
 	#$(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

Modified: trunk/topology/test/Makefile.in
===================================================================
--- trunk/topology/test/Makefile.in	2018-10-18 22:16:41 UTC (rev 16926)
+++ trunk/topology/test/Makefile.in	2018-10-18 22:36:34 UTC (rev 16927)
@@ -76,4 +76,7 @@
 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