]> granicus.if.org Git - postgis/commitdiff
#2794 sfcgal regress sfcgal doesn't install if RUNTESTFLAGS is set by user because...
authorRegina Obe <lr@pcorp.us>
Sun, 29 Jun 2014 21:21:57 +0000 (21:21 +0000)
committerRegina Obe <lr@pcorp.us>
Sun, 29 Jun 2014 21:21:57 +0000 (21:21 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@12703 b70326c6-7e19-0410-871a-916f4a2858ee

regress/Makefile.in

index a35a87761a1e7cd294049d2cb12287f0cd295243..c185331b32a4a85ffaa56877822ac98cb4aa04c1 100644 (file)
@@ -181,7 +181,7 @@ ifeq ($(HAVE_SFCGAL),yes)
                sfcgal/concave_hull.sql \
                sfcgal/wmsservers.sql
 
-       RUNTESTFLAGS = --sfcgal
+       SFCGALTESTFLAGS = --sfcgal
 endif
 
 
@@ -207,8 +207,8 @@ 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) $(TESTS) && \
-       $(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) $(TESTS)
+       $(PERL) run_test.pl $(RUNTESTFLAGS) ${SFCGALTESTFLAGS} $(TESTS) && \
+       $(PERL) run_test.pl --upgrade $(RUNTESTFLAGS) ${SFCGALTESTFLAGS} $(TESTS)
 
 garden:
        createdb postgis_garden