[postgis-tickets] r16933 - Fix "make check" on platforms without SFCGAL support

[Sandro Santilli]

Author: strk
Date: 2018-10-21 23:23:34 -0700 (Sun, 21 Oct 2018)
New Revision: 16933

Modified:
   trunk/regress/Makefile.in
   trunk/regress/sfcgal/Makefile.in
Log:
Fix "make check" on platforms without SFCGAL support

Modified: trunk/regress/Makefile.in
===================================================================
--- trunk/regress/Makefile.in	2018-10-21 10:19:25 UTC (rev 16932)
+++ trunk/regress/Makefile.in	2018-10-22 06:23:34 UTC (rev 16933)
@@ -12,6 +12,7 @@
 
 PERL=@PERL@
 MINGWBUILD=@MINGWBUILD@
+HAVE_SFCGAL=@HAVE_SFCGAL@
 
 # Where we put our regression installation
 ifeq ($(MINGWBUILD),1)
@@ -23,8 +24,12 @@
 
 all:
 
-check: staged-install check-core check-sfcgal
+check: staged-install check-core
 
+ifeq ($(HAVE_SFCGAL),yes)
+check: check-sfcgal
+endif
+
 check-core:
 	$(MAKE) -C core check
 

Modified: trunk/regress/sfcgal/Makefile.in
===================================================================
--- trunk/regress/sfcgal/Makefile.in	2018-10-21 10:19:25 UTC (rev 16932)
+++ trunk/regress/sfcgal/Makefile.in	2018-10-22 06:23:34 UTC (rev 16933)
@@ -17,6 +17,8 @@
 
 HAVE_SFCGAL=@HAVE_SFCGAL@
 
+ifeq ($(HAVE_SFCGAL),yes)
+
 # MingW hack: rather than use PGSQL_BINDIR directly, we change
 # to the directory and then use "pwd" to return the path. This
 # ensures that the returned path is in MSYS format, otherwise
@@ -29,12 +31,7 @@
 PATH := $(PGSQL_BINDIR):$(PATH)
 export PATH
 
-
-TESTS =
-
-ifeq ($(HAVE_SFCGAL),yes)
-	# SFCGAL additionnal backend
-	TESTS += \
+TESTS = \
 		regress_sfcgal \
 		empty.sql \
 		geography.sql \
@@ -48,20 +45,25 @@
 		wmsservers.sql \
 		approximatemedialaxis.sql
 
-	SFCGALTESTFLAGS = --sfcgal
-endif
+RUNTESTFLAGS += --sfcgal
 
+test check:
+	$(PERL) ../run_test.pl $(RUNTESTFLAGS) $(TESTS)
+	# only run upgrade test if RUNTESTFLAGS was not already doing that
+	if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
+		$(PERL) ../run_test.pl --upgrade $(RUNTESTFLAGS) $(TESTS); \
+	fi
 
-all install uninstall:
+else
 
+check:
+
+endif # HAVE_SFCGAL
+
 distclean: clean
 	rm Makefile
 
-test check:
-	$(PERL) ../run_test.pl $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS)
-	# only run upgrade test if RUNTESTFLAGS was not already doing that
-	if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
-		$(PERL) ../run_test.pl --upgrade $(RUNTESTFLAGS) $(SFCGALTESTFLAGS) $(TESTS); \
-	fi
+all install uninstall:
 
+
 clean: