pgspider
diff --git a/‎Makefile‎
Lines changed: 4 additions & 4 deletions b/‎Makefile‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎expected/13.15/types/postgis.out‎ ‎…ected/13.15/with_gis_support/postgis.out‎expected/13.15/types/postgis.out renamed to expected/13.15/with_gis_support/postgis.out b/‎expected/13.15/types/postgis.out‎ ‎…ected/13.15/with_gis_support/postgis.out‎expected/13.15/types/postgis.out renamed to expected/13.15/with_gis_support/postgis.out
diff --git a/‎expected/13.15/types/nogis.out‎ ‎…cted/13.15/without_gis_support/nogis.out‎expected/13.15/types/nogis.out renamed to expected/13.15/without_gis_support/nogis.out b/‎expected/13.15/types/nogis.out‎ ‎…cted/13.15/without_gis_support/nogis.out‎expected/13.15/types/nogis.out renamed to expected/13.15/without_gis_support/nogis.out
diff --git a/‎expected/14.12/types/postgis.out‎ ‎…ected/14.12/with_gis_support/postgis.out‎expected/14.12/types/postgis.out renamed to expected/14.12/with_gis_support/postgis.out b/‎expected/14.12/types/postgis.out‎ ‎…ected/14.12/with_gis_support/postgis.out‎expected/14.12/types/postgis.out renamed to expected/14.12/with_gis_support/postgis.out
diff --git a/‎expected/14.12/types/nogis.out‎ ‎…cted/14.12/without_gis_support/nogis.out‎expected/14.12/types/nogis.out renamed to expected/14.12/without_gis_support/nogis.out b/‎expected/14.12/types/nogis.out‎ ‎…cted/14.12/without_gis_support/nogis.out‎expected/14.12/types/nogis.out renamed to expected/14.12/without_gis_support/nogis.out
diff --git a/‎expected/15.7/types/postgis.out‎ ‎…pected/15.7/with_gis_support/postgis.out‎expected/15.7/types/postgis.out renamed to expected/15.7/with_gis_support/postgis.out b/‎expected/15.7/types/postgis.out‎ ‎…pected/15.7/with_gis_support/postgis.out‎expected/15.7/types/postgis.out renamed to expected/15.7/with_gis_support/postgis.out
diff --git a/‎expected/15.7/types/nogis.out‎ ‎…ected/15.7/without_gis_support/nogis.out‎expected/15.7/types/nogis.out renamed to expected/15.7/without_gis_support/nogis.out b/‎expected/15.7/types/nogis.out‎ ‎…ected/15.7/without_gis_support/nogis.out‎expected/15.7/types/nogis.out renamed to expected/15.7/without_gis_support/nogis.out
diff --git a/‎expected/16.3/types/postgis.out‎ ‎…pected/16.3/with_gis_support/postgis.out‎expected/16.3/types/postgis.out renamed to expected/16.3/with_gis_support/postgis.out b/‎expected/16.3/types/postgis.out‎ ‎…pected/16.3/with_gis_support/postgis.out‎expected/16.3/types/postgis.out renamed to expected/16.3/with_gis_support/postgis.out
diff --git a/‎expected/16.3/types/nogis.out‎ ‎…ected/16.3/without_gis_support/nogis.out‎expected/16.3/types/nogis.out renamed to expected/16.3/without_gis_support/nogis.out b/‎expected/16.3/types/nogis.out‎ ‎…ected/16.3/without_gis_support/nogis.out‎expected/16.3/types/nogis.out renamed to expected/16.3/without_gis_support/nogis.out
diff --git a/‎expected/17.0/types/postgis.out‎ ‎…pected/17.0/with_gis_support/postgis.out‎expected/17.0/types/postgis.out renamed to expected/17.0/with_gis_support/postgis.out b/‎expected/17.0/types/postgis.out‎ ‎…pected/17.0/with_gis_support/postgis.out‎expected/17.0/types/postgis.out renamed to expected/17.0/with_gis_support/postgis.out
@@ -17,19 +17,19 @@ DATA = sqlite_fdw--1.0.sql sqlite_fdw--1.0--1.1.sql
 
 ifdef ENABLE_GIS
 PG_CFLAGS += -DSQLITE_FDW_GIS_ENABLE
-GIS_TEST = postgis
 GIS_DEP_TESTS_DIR = with_gis_support
+GIS_TEST = postgis
 $(info  There is PostGIS support for SQLite FDW)
 else
-GIS_TEST = nogis
 GIS_DEP_TESTS_DIR = without_gis_support
+GIS_TEST = nogis
 $(info  There is NO PostGIS support for SQLite FDW)
 endif
 
 # Tests for PostgreSQL data types support
-DATA_TYPE_TESTS = types/bitstring types/bool types/float4 types/float8 types/int4 types/int8 types/numeric types/$(GIS_TEST) types/macaddr types/macaddr8 types/out_of_range types/timestamp types/uuid
+DATA_TYPE_TESTS = types/bitstring types/bool types/float4 types/float8 types/int4 types/int8 types/numeric  types/macaddr types/macaddr8 types/out_of_range types/timestamp types/uuid
 # Tests with different versions with GIS support and without GIS support
-GIS_DEP_TESTS = $(GIS_DEP_TESTS_DIR)/type $(GIS_DEP_TESTS_DIR)/auto_import
+GIS_DEP_TESTS = $(GIS_DEP_TESTS_DIR)/type $(GIS_DEP_TESTS_DIR)/auto_import $(GIS_DEP_TESTS_DIR)/$(GIS_TEST)
 
 ifndef REGRESS
 # System tests, full default sequence