From: Sandro Santilli Date: Fri, 19 Oct 2018 23:06:30 +0000 (+0000) Subject: Split core and sfcgal tests allowing to run one w/out the other X-Git-Tag: 3.0.0alpha1~332 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bfec159790393ab083a2e591d41aee9b630549f;p=postgis Split core and sfcgal tests allowing to run one w/out the other Closes #4200 git-svn-id: http://svn.osgeo.org/postgis/trunk@16929 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/.gitignore b/.gitignore index 0a754ee4b..8c81da7b2 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,8 @@ raster/test/regress/Makefile raster/test/regress/rtpostgis.sql regress/00-regress-install/ regress/Makefile +regress/core/Makefile +regress/sfcgal/Makefile regress/postgis.sql regress/postgis_garden_result.txt regress/raster_garden_result.txt diff --git a/configure.ac b/configure.ac index 645dd710f..f231d724f 100644 --- a/configure.ac +++ b/configure.ac @@ -1496,6 +1496,8 @@ AC_OUTPUT([GNUmakefile topology/Makefile topology/test/Makefile regress/Makefile + regress/core/Makefile + regress/sfcgal/Makefile doc/Makefile doc/Makefile.comments doc/html/image_src/Makefile diff --git a/regress/Makefile.in b/regress/Makefile.in index 5278823fd..a5e3bdd2d 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -3,9 +3,7 @@ # * PostGIS - Spatial Types for PostgreSQL # * http://postgis.net # * -# * Copyright (C) 2011-2012 Sandro Santilli -# * Copyright (C) 2009-2011 Paul Ramsey -# * Copyright (C) 2008-2009 Mark Cave-Ayland +# * Copyright (C) 2018 Sandro Santilli # * # * This is free software; you can redistribute and/or modify it under # * the terms of the GNU General Public Licence. See the COPYING file. @@ -13,27 +11,7 @@ # ********************************************************************** PERL=@PERL@ -TMPDIR?=/tmp - -POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@ -POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@ -GEOS_NUMERIC_VERSION=@GEOS_NUMERIC_VERSION@ -POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@ -POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@ -POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@ -HAVE_JSON=@HAVE_JSON@ -HAVE_PROTOBUF=@HAVE_PROTOBUF@ -HAVE_SFCGAL=@HAVE_SFCGAL@ -HAVE_BRIN=@HAVE_BRIN@ -HAVE_SPGIST=@HAVE_SPGIST@ MINGWBUILD=@MINGWBUILD@ -INTERRUPTTESTS=@INTERRUPTTESTS@ - -# 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 -# colons in drive letters will break PATH. -PGSQL_BINDIR=$(shell cd "@PGSQL_BINDIR@" && pwd) # Where we put our regression installation ifeq ($(MINGWBUILD),1) @@ -43,244 +21,26 @@ else endif REGRESS_INSTALLDIR=$(srcdir)/00-regress-install -# -# Put path from pg_config into front of search path -# -PATH := $(PGSQL_BINDIR):$(PATH) -export PATH - - -TESTS = \ - loader/Point \ - loader/PointM \ - loader/PointZ \ - loader/MultiPoint \ - loader/MultiPointM \ - loader/MultiPointZ \ - loader/Arc \ - loader/ArcM \ - loader/ArcZ \ - loader/Polygon \ - loader/PolygonM \ - loader/PolygonZ \ - loader/TSTPolygon \ - loader/TSIPolygon \ - loader/TSTIPolygon \ - loader/PointWithSchema \ - loader/NoTransPoint \ - loader/NotReallyMultiPoint \ - loader/MultiToSinglePoint \ - loader/ReprojectPts \ - loader/ReprojectPtsGeog \ - loader/Latin1 \ - loader/Latin1-implicit \ - loader/mfile \ - dumper/literalsrid \ - dumper/realtable \ - affine \ - bestsrid \ - binary \ - boundary \ - chaikin \ - filterm \ - cluster \ - concave_hull\ - concave_hull_hard\ - ctors \ - curvetoline \ - dump \ - dumppoints \ - empty \ - estimatedextent \ - forcecurve \ - geography \ - geometric_median \ - in_geohash \ - in_gml \ - in_kml \ - in_encodedpolyline \ - iscollection \ - legacy \ - long_xact \ - lwgeom_regress \ - measures \ - minimum_bounding_circle \ - normalize \ - operators \ - orientation \ - out_geometry \ - out_geography \ - polygonize \ - polyhedralsurface \ - postgis_type_name \ - quantize_coordinates \ - regress \ - regress_bdpoly \ - regress_index \ - regress_index_nulls \ - regress_management \ - regress_selectivity \ - regress_lrs \ - regress_ogc \ - regress_ogc_cover \ - regress_ogc_prep \ - regress_proj \ - relate \ - remove_repeated_points \ - removepoint \ - reverse \ - setpoint \ - simplify \ - simplifyvw \ - size \ - snaptogrid \ - split \ - sql-mm-serialize \ - sql-mm-circularstring \ - sql-mm-compoundcurve \ - sql-mm-curvepoly \ - sql-mm-general \ - sql-mm-multicurve \ - sql-mm-multisurface \ - swapordinates \ - summary \ - temporal \ - tickets \ - twkb \ - typmod \ - wkb \ - wkt \ - wmsservers - -ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) "<" 95),1) - # Index supported KNN only available in PostgreSQL 9.1 and higher - # For 9.5 and higher, use the recheck suite instead - TESTS += knn -endif - -ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) ">=" 95),1) - # Index supported KNN recheck only available in PostgreSQL 9.5 and higher - TESTS += knn_recheck \ - temporal_knn -endif - +all: check -TESTS += \ - hausdorff \ - regress_buffer_params - - -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 37),1) - # GEOS-3.7 adds: - # ST_FrechetDistance - TESTS += \ - frechet -endif +check: staged-install check-core check-sfcgal +check-core: + $(MAKE) -C core check -# GEOS-3.3 adds: -# ST_RelateMatch, ST_IsValidDetail, ST_SharedPaths , -# ST_Snap, ST_UnaryUnion, ST_MakeClean -TESTS += \ - offsetcurve \ - relatematch \ - isvaliddetail \ - sharedpaths \ - snap \ - node \ - unaryunion \ - clean \ - relate_bnr +check-sfcgal: + $(MAKE) -C sfcgal check -# GEOS-3.4 adds: -# ST_DelaunayTriangles -TESTS += \ - delaunaytriangles - - - -ifeq ($(INTERRUPTTESTS),yes) - # Allow CI servers to configure --with-interrupt-tests - TESTS += \ - interrupt \ - interrupt_relate \ - interrupt_buffer -endif - - -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 35),1) - # GEOS-3.5 adds: - # ST_ClipByBox2d, ST_Subdivide, ST_Voronoi - TESTS += \ - clipbybox2d \ - subdivide \ - voronoi -endif - -ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 36),1) - # GEOS-3.6 adds: - # ST_MinimumClearance - TESTS += \ - minimum_clearance \ - oriented_envelope -endif - -ifeq ($(HAVE_JSON),yes) - # JSON-C adds: - # ST_GeomFromGeoJSON() - TESTS += \ - in_geojson -endif - -ifeq ($(HAVE_BRIN),yes) - TESTS += \ - regress_brin_index \ - regress_brin_index_3d \ - regress_brin_index_geography -endif - -ifeq ($(HAVE_SPGIST),yes) - TESTS += \ - regress_spgist_index_2d \ - regress_spgist_index_3d -endif - -ifeq ($(HAVE_PROTOBUF),yes) - # protobuf-c adds: - # ST_AsMVT, ST_AsGeobuf - TESTS += \ - mvt \ - geobuf -ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) ">=" 94),1) - TESTS += \ - mvt_jsonb -endif -endif - -ifeq ($(HAVE_SFCGAL),yes) - # SFCGAL additionnal backend - TESTS += \ - regress_sfcgal \ - sfcgal/empty.sql \ - sfcgal/geography.sql \ - sfcgal/legacy.sql \ - sfcgal/measures.sql \ - sfcgal/regress_ogc_prep.sql \ - sfcgal/regress_ogc.sql \ - sfcgal/regress.sql \ - sfcgal/tickets.sql \ - sfcgal/concave_hull.sql \ - sfcgal/wmsservers.sql \ - sfcgal/approximatemedialaxis.sql - - SFCGALTESTFLAGS = --sfcgal -endif - - -all install uninstall: +clean: + $(MAKE) -C core $@ + $(MAKE) -C sfcgal $@ + rm -rf $(REGRESS_INSTALLDIR) + rm -f postgis_garden_result.txt distclean: clean - rm Makefile + $(MAKE) -C core $@ + $(MAKE) -C sfcgal $@ + rm -f Makefile staged-install-topology: @if test x"@TOPOLOGY@" != "x"; then \ @@ -298,13 +58,6 @@ staged-install: staged-install-raster staged-install-topology $(PERL) -pi.bak -e 's,\$$libdir,$(REGRESS_INSTALLDIR)/lib,g' $(REGRESS_INSTALLDIR)/share/contrib/postgis/*.sql #$(MAKE) -C ../loader REGRESS=1 DESTDIR=$(REGRESS_INSTALLDIR) install -test check: staged-install - $(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 - garden: createdb postgis_garden createlang plpgsql postgis_garden || true #tolerate an error here @@ -318,11 +71,3 @@ garden: psql -ad postgis_garden < ../doc/postgis_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > postgis_garden_result.txt 2>&1 psql -ad postgis_garden < ../doc/raster_gardentest_${POSTGIS_MAJOR_VERSION}${POSTGIS_MINOR_VERSION}.sql > raster_garden_result.txt 2>&1 #dropdb postgis_garden - -cleanup: - @sleep 1 - @dropdb postgis_reg > /dev/null - -clean: - rm -rf $(REGRESS_INSTALLDIR) - rm -f postgis_garden_result.txt diff --git a/regress/core/Makefile.in b/regress/core/Makefile.in new file mode 100644 index 000000000..e844ebf59 --- /dev/null +++ b/regress/core/Makefile.in @@ -0,0 +1,263 @@ +# ********************************************************************** +# * +# * PostGIS - Spatial Types for PostgreSQL +# * http://postgis.net +# * +# * Copyright (C) 2011-2012 Sandro Santilli +# * Copyright (C) 2009-2011 Paul Ramsey +# * Copyright (C) 2008-2009 Mark Cave-Ayland +# * +# * This is free software; you can redistribute and/or modify it under +# * the terms of the GNU General Public Licence. See the COPYING file. +# * +# ********************************************************************** + +PERL=@PERL@ +TMPDIR?=/tmp + +POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@ +POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@ +GEOS_NUMERIC_VERSION=@GEOS_NUMERIC_VERSION@ +POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@ +POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@ +POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@ +HAVE_JSON=@HAVE_JSON@ +HAVE_PROTOBUF=@HAVE_PROTOBUF@ +HAVE_BRIN=@HAVE_BRIN@ +HAVE_SPGIST=@HAVE_SPGIST@ +INTERRUPTTESTS=@INTERRUPTTESTS@ + +# 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 +# colons in drive letters will break PATH. +PGSQL_BINDIR=$(shell cd "@PGSQL_BINDIR@" && pwd) + + +# +# Put path from pg_config into front of search path +# +PATH := $(PGSQL_BINDIR):$(PATH) +export PATH + + +TESTS = \ + ../loader/Point \ + ../loader/PointM \ + ../loader/PointZ \ + ../loader/MultiPoint \ + ../loader/MultiPointM \ + ../loader/MultiPointZ \ + ../loader/Arc \ + ../loader/ArcM \ + ../loader/ArcZ \ + ../loader/Polygon \ + ../loader/PolygonM \ + ../loader/PolygonZ \ + ../loader/TSTPolygon \ + ../loader/TSIPolygon \ + ../loader/TSTIPolygon \ + ../loader/PointWithSchema \ + ../loader/NoTransPoint \ + ../loader/NotReallyMultiPoint \ + ../loader/MultiToSinglePoint \ + ../loader/ReprojectPts \ + ../loader/ReprojectPtsGeog \ + ../loader/Latin1 \ + ../loader/Latin1-implicit \ + ../loader/mfile \ + dumper/literalsrid \ + dumper/realtable \ + affine \ + bestsrid \ + binary \ + boundary \ + chaikin \ + filterm \ + cluster \ + concave_hull\ + concave_hull_hard\ + ctors \ + curvetoline \ + dump \ + dumppoints \ + empty \ + estimatedextent \ + forcecurve \ + geography \ + geometric_median \ + in_geohash \ + in_gml \ + in_kml \ + in_encodedpolyline \ + iscollection \ + legacy \ + long_xact \ + lwgeom_regress \ + measures \ + minimum_bounding_circle \ + normalize \ + operators \ + orientation \ + out_geometry \ + out_geography \ + polygonize \ + polyhedralsurface \ + postgis_type_name \ + quantize_coordinates \ + regress \ + regress_bdpoly \ + regress_index \ + regress_index_nulls \ + regress_management \ + regress_selectivity \ + regress_lrs \ + regress_ogc \ + regress_ogc_cover \ + regress_ogc_prep \ + regress_proj \ + relate \ + remove_repeated_points \ + removepoint \ + reverse \ + setpoint \ + simplify \ + simplifyvw \ + size \ + snaptogrid \ + split \ + sql-mm-serialize \ + sql-mm-circularstring \ + sql-mm-compoundcurve \ + sql-mm-curvepoly \ + sql-mm-general \ + sql-mm-multicurve \ + sql-mm-multisurface \ + swapordinates \ + summary \ + temporal \ + tickets \ + twkb \ + typmod \ + wkb \ + wkt \ + wmsservers + +ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) "<" 95),1) + # Index supported KNN only available in PostgreSQL 9.1 and higher + # For 9.5 and higher, use the recheck suite instead + TESTS += knn +endif + +ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) ">=" 95),1) + # Index supported KNN recheck only available in PostgreSQL 9.5 and higher + TESTS += knn_recheck \ + temporal_knn +endif + + +TESTS += \ + hausdorff \ + regress_buffer_params + + +ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 37),1) + # GEOS-3.7 adds: + # ST_FrechetDistance + TESTS += \ + frechet +endif + + +# GEOS-3.3 adds: +# ST_RelateMatch, ST_IsValidDetail, ST_SharedPaths , +# ST_Snap, ST_UnaryUnion, ST_MakeClean +TESTS += \ + offsetcurve \ + relatematch \ + isvaliddetail \ + sharedpaths \ + snap \ + node \ + unaryunion \ + clean \ + relate_bnr + +# GEOS-3.4 adds: +# ST_DelaunayTriangles +TESTS += \ + delaunaytriangles + + + +ifeq ($(INTERRUPTTESTS),yes) + # Allow CI servers to configure --with-interrupt-tests + TESTS += \ + interrupt \ + interrupt_relate \ + interrupt_buffer +endif + + +ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 35),1) + # GEOS-3.5 adds: + # ST_ClipByBox2d, ST_Subdivide, ST_Voronoi + TESTS += \ + clipbybox2d \ + subdivide \ + voronoi +endif + +ifeq ($(shell expr $(POSTGIS_GEOS_VERSION) ">=" 36),1) + # GEOS-3.6 adds: + # ST_MinimumClearance + TESTS += \ + minimum_clearance \ + oriented_envelope +endif + +ifeq ($(HAVE_JSON),yes) + # JSON-C adds: + # ST_GeomFromGeoJSON() + TESTS += \ + in_geojson +endif + +ifeq ($(HAVE_BRIN),yes) + TESTS += \ + regress_brin_index \ + regress_brin_index_3d \ + regress_brin_index_geography +endif + +ifeq ($(HAVE_SPGIST),yes) + TESTS += \ + regress_spgist_index_2d \ + regress_spgist_index_3d +endif + +ifeq ($(HAVE_PROTOBUF),yes) + # protobuf-c adds: + # ST_AsMVT, ST_AsGeobuf + TESTS += \ + mvt \ + geobuf +ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) ">=" 94),1) + TESTS += \ + mvt_jsonb +endif +endif + +all install uninstall: + +distclean: clean + rm Makefile + +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 + +clean: diff --git a/regress/affine.sql b/regress/core/affine.sql similarity index 100% rename from regress/affine.sql rename to regress/core/affine.sql diff --git a/regress/affine_expected b/regress/core/affine_expected similarity index 100% rename from regress/affine_expected rename to regress/core/affine_expected diff --git a/regress/bestsrid.sql b/regress/core/bestsrid.sql similarity index 100% rename from regress/bestsrid.sql rename to regress/core/bestsrid.sql diff --git a/regress/bestsrid_expected b/regress/core/bestsrid_expected similarity index 100% rename from regress/bestsrid_expected rename to regress/core/bestsrid_expected diff --git a/regress/big_polygon.wkb b/regress/core/big_polygon.wkb similarity index 100% rename from regress/big_polygon.wkb rename to regress/core/big_polygon.wkb diff --git a/regress/binary.sql b/regress/core/binary.sql similarity index 100% rename from regress/binary.sql rename to regress/core/binary.sql diff --git a/regress/binary_expected b/regress/core/binary_expected similarity index 100% rename from regress/binary_expected rename to regress/core/binary_expected diff --git a/regress/boundary.sql b/regress/core/boundary.sql similarity index 100% rename from regress/boundary.sql rename to regress/core/boundary.sql diff --git a/regress/boundary_expected b/regress/core/boundary_expected similarity index 100% rename from regress/boundary_expected rename to regress/core/boundary_expected diff --git a/regress/chaikin.sql b/regress/core/chaikin.sql similarity index 100% rename from regress/chaikin.sql rename to regress/core/chaikin.sql diff --git a/regress/chaikin_expected b/regress/core/chaikin_expected similarity index 100% rename from regress/chaikin_expected rename to regress/core/chaikin_expected diff --git a/regress/clean.sql b/regress/core/clean.sql similarity index 100% rename from regress/clean.sql rename to regress/core/clean.sql diff --git a/regress/clean_expected b/regress/core/clean_expected similarity index 100% rename from regress/clean_expected rename to regress/core/clean_expected diff --git a/regress/clipbybox2d.sql b/regress/core/clipbybox2d.sql similarity index 100% rename from regress/clipbybox2d.sql rename to regress/core/clipbybox2d.sql diff --git a/regress/clipbybox2d_expected b/regress/core/clipbybox2d_expected similarity index 100% rename from regress/clipbybox2d_expected rename to regress/core/clipbybox2d_expected diff --git a/regress/cluster.sql b/regress/core/cluster.sql similarity index 100% rename from regress/cluster.sql rename to regress/core/cluster.sql diff --git a/regress/cluster_expected b/regress/core/cluster_expected similarity index 100% rename from regress/cluster_expected rename to regress/core/cluster_expected diff --git a/regress/concave_hull.sql b/regress/core/concave_hull.sql similarity index 100% rename from regress/concave_hull.sql rename to regress/core/concave_hull.sql diff --git a/regress/concave_hull_expected b/regress/core/concave_hull_expected similarity index 100% rename from regress/concave_hull_expected rename to regress/core/concave_hull_expected diff --git a/regress/concave_hull_hard.sql b/regress/core/concave_hull_hard.sql similarity index 100% rename from regress/concave_hull_hard.sql rename to regress/core/concave_hull_hard.sql diff --git a/regress/concave_hull_hard_expected b/regress/core/concave_hull_hard_expected similarity index 100% rename from regress/concave_hull_hard_expected rename to regress/core/concave_hull_hard_expected diff --git a/regress/ctors.sql b/regress/core/ctors.sql similarity index 100% rename from regress/ctors.sql rename to regress/core/ctors.sql diff --git a/regress/ctors_expected b/regress/core/ctors_expected similarity index 100% rename from regress/ctors_expected rename to regress/core/ctors_expected diff --git a/regress/curvetoline.sql b/regress/core/curvetoline.sql similarity index 100% rename from regress/curvetoline.sql rename to regress/core/curvetoline.sql diff --git a/regress/curvetoline_expected b/regress/core/curvetoline_expected similarity index 100% rename from regress/curvetoline_expected rename to regress/core/curvetoline_expected diff --git a/regress/delaunaytriangles.sql b/regress/core/delaunaytriangles.sql similarity index 100% rename from regress/delaunaytriangles.sql rename to regress/core/delaunaytriangles.sql diff --git a/regress/delaunaytriangles_expected b/regress/core/delaunaytriangles_expected similarity index 100% rename from regress/delaunaytriangles_expected rename to regress/core/delaunaytriangles_expected diff --git a/regress/dump.sql b/regress/core/dump.sql similarity index 100% rename from regress/dump.sql rename to regress/core/dump.sql diff --git a/regress/dump_expected b/regress/core/dump_expected similarity index 100% rename from regress/dump_expected rename to regress/core/dump_expected diff --git a/regress/dumppoints.sql b/regress/core/dumppoints.sql similarity index 100% rename from regress/dumppoints.sql rename to regress/core/dumppoints.sql diff --git a/regress/dumppoints_expected b/regress/core/dumppoints_expected similarity index 100% rename from regress/dumppoints_expected rename to regress/core/dumppoints_expected diff --git a/regress/empty.sql b/regress/core/empty.sql similarity index 100% rename from regress/empty.sql rename to regress/core/empty.sql diff --git a/regress/empty_expected b/regress/core/empty_expected similarity index 100% rename from regress/empty_expected rename to regress/core/empty_expected diff --git a/regress/estimatedextent.sql b/regress/core/estimatedextent.sql similarity index 100% rename from regress/estimatedextent.sql rename to regress/core/estimatedextent.sql diff --git a/regress/estimatedextent_expected b/regress/core/estimatedextent_expected similarity index 100% rename from regress/estimatedextent_expected rename to regress/core/estimatedextent_expected diff --git a/regress/filterm.sql b/regress/core/filterm.sql similarity index 100% rename from regress/filterm.sql rename to regress/core/filterm.sql diff --git a/regress/filterm_expected b/regress/core/filterm_expected similarity index 100% rename from regress/filterm_expected rename to regress/core/filterm_expected diff --git a/regress/forcecurve.sql b/regress/core/forcecurve.sql similarity index 100% rename from regress/forcecurve.sql rename to regress/core/forcecurve.sql diff --git a/regress/forcecurve_expected b/regress/core/forcecurve_expected similarity index 100% rename from regress/forcecurve_expected rename to regress/core/forcecurve_expected diff --git a/regress/frechet.sql b/regress/core/frechet.sql similarity index 100% rename from regress/frechet.sql rename to regress/core/frechet.sql diff --git a/regress/frechet_expected b/regress/core/frechet_expected similarity index 100% rename from regress/frechet_expected rename to regress/core/frechet_expected diff --git a/regress/geobuf.sql b/regress/core/geobuf.sql similarity index 100% rename from regress/geobuf.sql rename to regress/core/geobuf.sql diff --git a/regress/geobuf_expected b/regress/core/geobuf_expected similarity index 100% rename from regress/geobuf_expected rename to regress/core/geobuf_expected diff --git a/regress/geography.sql b/regress/core/geography.sql similarity index 100% rename from regress/geography.sql rename to regress/core/geography.sql diff --git a/regress/geography_centroid.sql b/regress/core/geography_centroid.sql similarity index 100% rename from regress/geography_centroid.sql rename to regress/core/geography_centroid.sql diff --git a/regress/geography_centroid_expected b/regress/core/geography_centroid_expected similarity index 100% rename from regress/geography_centroid_expected rename to regress/core/geography_centroid_expected diff --git a/regress/geography_covers.sql b/regress/core/geography_covers.sql similarity index 100% rename from regress/geography_covers.sql rename to regress/core/geography_covers.sql diff --git a/regress/geography_covers_expected b/regress/core/geography_covers_expected similarity index 100% rename from regress/geography_covers_expected rename to regress/core/geography_covers_expected diff --git a/regress/geography_expected b/regress/core/geography_expected similarity index 100% rename from regress/geography_expected rename to regress/core/geography_expected diff --git a/regress/geometric_median.sql b/regress/core/geometric_median.sql similarity index 100% rename from regress/geometric_median.sql rename to regress/core/geometric_median.sql diff --git a/regress/geometric_median_expected b/regress/core/geometric_median_expected similarity index 100% rename from regress/geometric_median_expected rename to regress/core/geometric_median_expected diff --git a/regress/hausdorff.sql b/regress/core/hausdorff.sql similarity index 100% rename from regress/hausdorff.sql rename to regress/core/hausdorff.sql diff --git a/regress/hausdorff_expected b/regress/core/hausdorff_expected similarity index 100% rename from regress/hausdorff_expected rename to regress/core/hausdorff_expected diff --git a/regress/in_encodedpolyline.sql b/regress/core/in_encodedpolyline.sql similarity index 100% rename from regress/in_encodedpolyline.sql rename to regress/core/in_encodedpolyline.sql diff --git a/regress/in_encodedpolyline_expected b/regress/core/in_encodedpolyline_expected similarity index 100% rename from regress/in_encodedpolyline_expected rename to regress/core/in_encodedpolyline_expected diff --git a/regress/in_geohash.sql b/regress/core/in_geohash.sql similarity index 100% rename from regress/in_geohash.sql rename to regress/core/in_geohash.sql diff --git a/regress/in_geohash_expected b/regress/core/in_geohash_expected similarity index 100% rename from regress/in_geohash_expected rename to regress/core/in_geohash_expected diff --git a/regress/in_geojson.sql b/regress/core/in_geojson.sql similarity index 100% rename from regress/in_geojson.sql rename to regress/core/in_geojson.sql diff --git a/regress/in_geojson_expected b/regress/core/in_geojson_expected similarity index 100% rename from regress/in_geojson_expected rename to regress/core/in_geojson_expected diff --git a/regress/in_gml.sql b/regress/core/in_gml.sql similarity index 100% rename from regress/in_gml.sql rename to regress/core/in_gml.sql diff --git a/regress/in_gml_expected b/regress/core/in_gml_expected similarity index 100% rename from regress/in_gml_expected rename to regress/core/in_gml_expected diff --git a/regress/in_kml.sql b/regress/core/in_kml.sql similarity index 100% rename from regress/in_kml.sql rename to regress/core/in_kml.sql diff --git a/regress/in_kml_expected b/regress/core/in_kml_expected similarity index 100% rename from regress/in_kml_expected rename to regress/core/in_kml_expected diff --git a/regress/interrupt.sql b/regress/core/interrupt.sql similarity index 100% rename from regress/interrupt.sql rename to regress/core/interrupt.sql diff --git a/regress/interrupt_buffer.sql b/regress/core/interrupt_buffer.sql similarity index 100% rename from regress/interrupt_buffer.sql rename to regress/core/interrupt_buffer.sql diff --git a/regress/interrupt_buffer_expected b/regress/core/interrupt_buffer_expected similarity index 100% rename from regress/interrupt_buffer_expected rename to regress/core/interrupt_buffer_expected diff --git a/regress/interrupt_expected b/regress/core/interrupt_expected similarity index 100% rename from regress/interrupt_expected rename to regress/core/interrupt_expected diff --git a/regress/interrupt_relate.sql b/regress/core/interrupt_relate.sql similarity index 100% rename from regress/interrupt_relate.sql rename to regress/core/interrupt_relate.sql diff --git a/regress/interrupt_relate_expected b/regress/core/interrupt_relate_expected similarity index 100% rename from regress/interrupt_relate_expected rename to regress/core/interrupt_relate_expected diff --git a/regress/iscollection.sql b/regress/core/iscollection.sql similarity index 100% rename from regress/iscollection.sql rename to regress/core/iscollection.sql diff --git a/regress/iscollection_expected b/regress/core/iscollection_expected similarity index 100% rename from regress/iscollection_expected rename to regress/core/iscollection_expected diff --git a/regress/isvaliddetail.sql b/regress/core/isvaliddetail.sql similarity index 100% rename from regress/isvaliddetail.sql rename to regress/core/isvaliddetail.sql diff --git a/regress/isvaliddetail_expected b/regress/core/isvaliddetail_expected similarity index 100% rename from regress/isvaliddetail_expected rename to regress/core/isvaliddetail_expected diff --git a/regress/knn.sql b/regress/core/knn.sql similarity index 100% rename from regress/knn.sql rename to regress/core/knn.sql diff --git a/regress/knn_expected b/regress/core/knn_expected similarity index 100% rename from regress/knn_expected rename to regress/core/knn_expected diff --git a/regress/knn_recheck.sql b/regress/core/knn_recheck.sql similarity index 100% rename from regress/knn_recheck.sql rename to regress/core/knn_recheck.sql diff --git a/regress/knn_recheck_expected b/regress/core/knn_recheck_expected similarity index 100% rename from regress/knn_recheck_expected rename to regress/core/knn_recheck_expected diff --git a/regress/legacy.sql b/regress/core/legacy.sql similarity index 100% rename from regress/legacy.sql rename to regress/core/legacy.sql diff --git a/regress/legacy_expected b/regress/core/legacy_expected similarity index 100% rename from regress/legacy_expected rename to regress/core/legacy_expected diff --git a/regress/long_xact.sql b/regress/core/long_xact.sql similarity index 100% rename from regress/long_xact.sql rename to regress/core/long_xact.sql diff --git a/regress/long_xact_expected b/regress/core/long_xact_expected similarity index 100% rename from regress/long_xact_expected rename to regress/core/long_xact_expected diff --git a/regress/lwgeom_regress.sql b/regress/core/lwgeom_regress.sql similarity index 100% rename from regress/lwgeom_regress.sql rename to regress/core/lwgeom_regress.sql diff --git a/regress/lwgeom_regress_expected b/regress/core/lwgeom_regress_expected similarity index 100% rename from regress/lwgeom_regress_expected rename to regress/core/lwgeom_regress_expected diff --git a/regress/measures.sql b/regress/core/measures.sql similarity index 100% rename from regress/measures.sql rename to regress/core/measures.sql diff --git a/regress/measures_expected b/regress/core/measures_expected similarity index 100% rename from regress/measures_expected rename to regress/core/measures_expected diff --git a/regress/minimum_bounding_circle.sql b/regress/core/minimum_bounding_circle.sql similarity index 100% rename from regress/minimum_bounding_circle.sql rename to regress/core/minimum_bounding_circle.sql diff --git a/regress/minimum_bounding_circle_expected b/regress/core/minimum_bounding_circle_expected similarity index 100% rename from regress/minimum_bounding_circle_expected rename to regress/core/minimum_bounding_circle_expected diff --git a/regress/minimum_clearance.sql b/regress/core/minimum_clearance.sql similarity index 100% rename from regress/minimum_clearance.sql rename to regress/core/minimum_clearance.sql diff --git a/regress/minimum_clearance_expected b/regress/core/minimum_clearance_expected similarity index 100% rename from regress/minimum_clearance_expected rename to regress/core/minimum_clearance_expected diff --git a/regress/mvt.sql b/regress/core/mvt.sql similarity index 100% rename from regress/mvt.sql rename to regress/core/mvt.sql diff --git a/regress/mvt_expected b/regress/core/mvt_expected similarity index 100% rename from regress/mvt_expected rename to regress/core/mvt_expected diff --git a/regress/mvt_jsonb.sql b/regress/core/mvt_jsonb.sql similarity index 100% rename from regress/mvt_jsonb.sql rename to regress/core/mvt_jsonb.sql diff --git a/regress/mvt_jsonb_expected b/regress/core/mvt_jsonb_expected similarity index 100% rename from regress/mvt_jsonb_expected rename to regress/core/mvt_jsonb_expected diff --git a/regress/node.sql b/regress/core/node.sql similarity index 100% rename from regress/node.sql rename to regress/core/node.sql diff --git a/regress/node_expected b/regress/core/node_expected similarity index 100% rename from regress/node_expected rename to regress/core/node_expected diff --git a/regress/normalize.sql b/regress/core/normalize.sql similarity index 100% rename from regress/normalize.sql rename to regress/core/normalize.sql diff --git a/regress/normalize_expected b/regress/core/normalize_expected similarity index 100% rename from regress/normalize_expected rename to regress/core/normalize_expected diff --git a/regress/offsetcurve.sql b/regress/core/offsetcurve.sql similarity index 100% rename from regress/offsetcurve.sql rename to regress/core/offsetcurve.sql diff --git a/regress/offsetcurve_expected b/regress/core/offsetcurve_expected similarity index 100% rename from regress/offsetcurve_expected rename to regress/core/offsetcurve_expected diff --git a/regress/operators.sql b/regress/core/operators.sql similarity index 100% rename from regress/operators.sql rename to regress/core/operators.sql diff --git a/regress/operators_expected b/regress/core/operators_expected similarity index 100% rename from regress/operators_expected rename to regress/core/operators_expected diff --git a/regress/orientation.sql b/regress/core/orientation.sql similarity index 100% rename from regress/orientation.sql rename to regress/core/orientation.sql diff --git a/regress/orientation_expected b/regress/core/orientation_expected similarity index 100% rename from regress/orientation_expected rename to regress/core/orientation_expected diff --git a/regress/oriented_envelope.sql b/regress/core/oriented_envelope.sql similarity index 100% rename from regress/oriented_envelope.sql rename to regress/core/oriented_envelope.sql diff --git a/regress/oriented_envelope_expected b/regress/core/oriented_envelope_expected similarity index 100% rename from regress/oriented_envelope_expected rename to regress/core/oriented_envelope_expected diff --git a/regress/out_geography.sql b/regress/core/out_geography.sql similarity index 100% rename from regress/out_geography.sql rename to regress/core/out_geography.sql diff --git a/regress/out_geography_expected b/regress/core/out_geography_expected similarity index 100% rename from regress/out_geography_expected rename to regress/core/out_geography_expected diff --git a/regress/out_geometry.sql b/regress/core/out_geometry.sql similarity index 100% rename from regress/out_geometry.sql rename to regress/core/out_geometry.sql diff --git a/regress/out_geometry_expected b/regress/core/out_geometry_expected similarity index 100% rename from regress/out_geometry_expected rename to regress/core/out_geometry_expected diff --git a/regress/polygonize.sql b/regress/core/polygonize.sql similarity index 100% rename from regress/polygonize.sql rename to regress/core/polygonize.sql diff --git a/regress/polygonize_expected b/regress/core/polygonize_expected similarity index 100% rename from regress/polygonize_expected rename to regress/core/polygonize_expected diff --git a/regress/polyhedralsurface.sql b/regress/core/polyhedralsurface.sql similarity index 100% rename from regress/polyhedralsurface.sql rename to regress/core/polyhedralsurface.sql diff --git a/regress/polyhedralsurface_expected b/regress/core/polyhedralsurface_expected similarity index 100% rename from regress/polyhedralsurface_expected rename to regress/core/polyhedralsurface_expected diff --git a/regress/postgis_type_name.sql b/regress/core/postgis_type_name.sql similarity index 100% rename from regress/postgis_type_name.sql rename to regress/core/postgis_type_name.sql diff --git a/regress/postgis_type_name_expected b/regress/core/postgis_type_name_expected similarity index 100% rename from regress/postgis_type_name_expected rename to regress/core/postgis_type_name_expected diff --git a/regress/quantize_coordinates.sql b/regress/core/quantize_coordinates.sql similarity index 100% rename from regress/quantize_coordinates.sql rename to regress/core/quantize_coordinates.sql diff --git a/regress/quantize_coordinates_expected b/regress/core/quantize_coordinates_expected similarity index 100% rename from regress/quantize_coordinates_expected rename to regress/core/quantize_coordinates_expected diff --git a/regress/regress.sql b/regress/core/regress.sql similarity index 100% rename from regress/regress.sql rename to regress/core/regress.sql diff --git a/regress/regress_bdpoly.sql b/regress/core/regress_bdpoly.sql similarity index 100% rename from regress/regress_bdpoly.sql rename to regress/core/regress_bdpoly.sql diff --git a/regress/regress_bdpoly_expected b/regress/core/regress_bdpoly_expected similarity index 100% rename from regress/regress_bdpoly_expected rename to regress/core/regress_bdpoly_expected diff --git a/regress/regress_big_polygon.sql b/regress/core/regress_big_polygon.sql similarity index 100% rename from regress/regress_big_polygon.sql rename to regress/core/regress_big_polygon.sql diff --git a/regress/regress_biginsert.sql b/regress/core/regress_biginsert.sql similarity index 100% rename from regress/regress_biginsert.sql rename to regress/core/regress_biginsert.sql diff --git a/regress/regress_brin_index.sql b/regress/core/regress_brin_index.sql similarity index 100% rename from regress/regress_brin_index.sql rename to regress/core/regress_brin_index.sql diff --git a/regress/regress_brin_index_3d.sql b/regress/core/regress_brin_index_3d.sql similarity index 100% rename from regress/regress_brin_index_3d.sql rename to regress/core/regress_brin_index_3d.sql diff --git a/regress/regress_brin_index_3d_expected b/regress/core/regress_brin_index_3d_expected similarity index 100% rename from regress/regress_brin_index_3d_expected rename to regress/core/regress_brin_index_3d_expected diff --git a/regress/regress_brin_index_expected b/regress/core/regress_brin_index_expected similarity index 100% rename from regress/regress_brin_index_expected rename to regress/core/regress_brin_index_expected diff --git a/regress/regress_brin_index_geography.sql b/regress/core/regress_brin_index_geography.sql similarity index 100% rename from regress/regress_brin_index_geography.sql rename to regress/core/regress_brin_index_geography.sql diff --git a/regress/regress_brin_index_geography_expected b/regress/core/regress_brin_index_geography_expected similarity index 100% rename from regress/regress_brin_index_geography_expected rename to regress/core/regress_brin_index_geography_expected diff --git a/regress/regress_buffer_params.sql b/regress/core/regress_buffer_params.sql similarity index 100% rename from regress/regress_buffer_params.sql rename to regress/core/regress_buffer_params.sql diff --git a/regress/regress_buffer_params_expected b/regress/core/regress_buffer_params_expected similarity index 100% rename from regress/regress_buffer_params_expected rename to regress/core/regress_buffer_params_expected diff --git a/regress/regress_expected b/regress/core/regress_expected similarity index 100% rename from regress/regress_expected rename to regress/core/regress_expected diff --git a/regress/regress_index.sql b/regress/core/regress_index.sql similarity index 100% rename from regress/regress_index.sql rename to regress/core/regress_index.sql diff --git a/regress/regress_index_expected b/regress/core/regress_index_expected similarity index 100% rename from regress/regress_index_expected rename to regress/core/regress_index_expected diff --git a/regress/regress_index_nulls.sql b/regress/core/regress_index_nulls.sql similarity index 100% rename from regress/regress_index_nulls.sql rename to regress/core/regress_index_nulls.sql diff --git a/regress/regress_index_nulls_expected b/regress/core/regress_index_nulls_expected similarity index 100% rename from regress/regress_index_nulls_expected rename to regress/core/regress_index_nulls_expected diff --git a/regress/regress_lots_of_3dpoints.sql b/regress/core/regress_lots_of_3dpoints.sql similarity index 100% rename from regress/regress_lots_of_3dpoints.sql rename to regress/core/regress_lots_of_3dpoints.sql diff --git a/regress/regress_lots_of_geographies.sql b/regress/core/regress_lots_of_geographies.sql similarity index 100% rename from regress/regress_lots_of_geographies.sql rename to regress/core/regress_lots_of_geographies.sql diff --git a/regress/regress_lots_of_nulls.sql b/regress/core/regress_lots_of_nulls.sql similarity index 100% rename from regress/regress_lots_of_nulls.sql rename to regress/core/regress_lots_of_nulls.sql diff --git a/regress/regress_lots_of_points.sql b/regress/core/regress_lots_of_points.sql similarity index 100% rename from regress/regress_lots_of_points.sql rename to regress/core/regress_lots_of_points.sql diff --git a/regress/regress_lrs.sql b/regress/core/regress_lrs.sql similarity index 100% rename from regress/regress_lrs.sql rename to regress/core/regress_lrs.sql diff --git a/regress/regress_lrs_expected b/regress/core/regress_lrs_expected similarity index 100% rename from regress/regress_lrs_expected rename to regress/core/regress_lrs_expected diff --git a/regress/regress_management.sql b/regress/core/regress_management.sql similarity index 100% rename from regress/regress_management.sql rename to regress/core/regress_management.sql diff --git a/regress/regress_management_expected b/regress/core/regress_management_expected similarity index 100% rename from regress/regress_management_expected rename to regress/core/regress_management_expected diff --git a/regress/regress_ogc.sql b/regress/core/regress_ogc.sql similarity index 100% rename from regress/regress_ogc.sql rename to regress/core/regress_ogc.sql diff --git a/regress/regress_ogc_cover.sql b/regress/core/regress_ogc_cover.sql similarity index 100% rename from regress/regress_ogc_cover.sql rename to regress/core/regress_ogc_cover.sql diff --git a/regress/regress_ogc_cover_expected b/regress/core/regress_ogc_cover_expected similarity index 100% rename from regress/regress_ogc_cover_expected rename to regress/core/regress_ogc_cover_expected diff --git a/regress/regress_ogc_expected b/regress/core/regress_ogc_expected similarity index 100% rename from regress/regress_ogc_expected rename to regress/core/regress_ogc_expected diff --git a/regress/regress_ogc_prep.sql b/regress/core/regress_ogc_prep.sql similarity index 100% rename from regress/regress_ogc_prep.sql rename to regress/core/regress_ogc_prep.sql diff --git a/regress/regress_ogc_prep_expected b/regress/core/regress_ogc_prep_expected similarity index 100% rename from regress/regress_ogc_prep_expected rename to regress/core/regress_ogc_prep_expected diff --git a/regress/regress_proj.sql b/regress/core/regress_proj.sql similarity index 100% rename from regress/regress_proj.sql rename to regress/core/regress_proj.sql diff --git a/regress/regress_proj_expected b/regress/core/regress_proj_expected similarity index 100% rename from regress/regress_proj_expected rename to regress/core/regress_proj_expected diff --git a/regress/regress_selectivity.sql b/regress/core/regress_selectivity.sql similarity index 100% rename from regress/regress_selectivity.sql rename to regress/core/regress_selectivity.sql diff --git a/regress/regress_selectivity_expected b/regress/core/regress_selectivity_expected similarity index 100% rename from regress/regress_selectivity_expected rename to regress/core/regress_selectivity_expected diff --git a/regress/regress_sfcgal.sql b/regress/core/regress_sfcgal.sql similarity index 100% rename from regress/regress_sfcgal.sql rename to regress/core/regress_sfcgal.sql diff --git a/regress/regress_sfcgal_expected b/regress/core/regress_sfcgal_expected similarity index 100% rename from regress/regress_sfcgal_expected rename to regress/core/regress_sfcgal_expected diff --git a/regress/regress_spgist_index_2d.data b/regress/core/regress_spgist_index_2d.data similarity index 100% rename from regress/regress_spgist_index_2d.data rename to regress/core/regress_spgist_index_2d.data diff --git a/regress/regress_spgist_index_2d.sql b/regress/core/regress_spgist_index_2d.sql similarity index 100% rename from regress/regress_spgist_index_2d.sql rename to regress/core/regress_spgist_index_2d.sql diff --git a/regress/regress_spgist_index_2d_expected b/regress/core/regress_spgist_index_2d_expected similarity index 100% rename from regress/regress_spgist_index_2d_expected rename to regress/core/regress_spgist_index_2d_expected diff --git a/regress/regress_spgist_index_3d.data b/regress/core/regress_spgist_index_3d.data similarity index 100% rename from regress/regress_spgist_index_3d.data rename to regress/core/regress_spgist_index_3d.data diff --git a/regress/regress_spgist_index_3d.sql b/regress/core/regress_spgist_index_3d.sql similarity index 100% rename from regress/regress_spgist_index_3d.sql rename to regress/core/regress_spgist_index_3d.sql diff --git a/regress/regress_spgist_index_3d_expected b/regress/core/regress_spgist_index_3d_expected similarity index 100% rename from regress/regress_spgist_index_3d_expected rename to regress/core/regress_spgist_index_3d_expected diff --git a/regress/relate.sql b/regress/core/relate.sql similarity index 100% rename from regress/relate.sql rename to regress/core/relate.sql diff --git a/regress/relate_bnr.sql b/regress/core/relate_bnr.sql similarity index 100% rename from regress/relate_bnr.sql rename to regress/core/relate_bnr.sql diff --git a/regress/relate_bnr_expected b/regress/core/relate_bnr_expected similarity index 100% rename from regress/relate_bnr_expected rename to regress/core/relate_bnr_expected diff --git a/regress/relate_expected b/regress/core/relate_expected similarity index 100% rename from regress/relate_expected rename to regress/core/relate_expected diff --git a/regress/relatematch.sql b/regress/core/relatematch.sql similarity index 100% rename from regress/relatematch.sql rename to regress/core/relatematch.sql diff --git a/regress/relatematch_expected b/regress/core/relatematch_expected similarity index 100% rename from regress/relatematch_expected rename to regress/core/relatematch_expected diff --git a/regress/remove_repeated_points.sql b/regress/core/remove_repeated_points.sql similarity index 100% rename from regress/remove_repeated_points.sql rename to regress/core/remove_repeated_points.sql diff --git a/regress/remove_repeated_points_expected b/regress/core/remove_repeated_points_expected similarity index 100% rename from regress/remove_repeated_points_expected rename to regress/core/remove_repeated_points_expected diff --git a/regress/removepoint.sql b/regress/core/removepoint.sql similarity index 100% rename from regress/removepoint.sql rename to regress/core/removepoint.sql diff --git a/regress/removepoint_expected b/regress/core/removepoint_expected similarity index 100% rename from regress/removepoint_expected rename to regress/core/removepoint_expected diff --git a/regress/reverse.sql b/regress/core/reverse.sql similarity index 100% rename from regress/reverse.sql rename to regress/core/reverse.sql diff --git a/regress/reverse_expected b/regress/core/reverse_expected similarity index 100% rename from regress/reverse_expected rename to regress/core/reverse_expected diff --git a/regress/setpoint.sql b/regress/core/setpoint.sql similarity index 100% rename from regress/setpoint.sql rename to regress/core/setpoint.sql diff --git a/regress/setpoint_expected b/regress/core/setpoint_expected similarity index 100% rename from regress/setpoint_expected rename to regress/core/setpoint_expected diff --git a/regress/sharedpaths.sql b/regress/core/sharedpaths.sql similarity index 100% rename from regress/sharedpaths.sql rename to regress/core/sharedpaths.sql diff --git a/regress/sharedpaths_expected b/regress/core/sharedpaths_expected similarity index 100% rename from regress/sharedpaths_expected rename to regress/core/sharedpaths_expected diff --git a/regress/simplify.sql b/regress/core/simplify.sql similarity index 100% rename from regress/simplify.sql rename to regress/core/simplify.sql diff --git a/regress/simplify_expected b/regress/core/simplify_expected similarity index 100% rename from regress/simplify_expected rename to regress/core/simplify_expected diff --git a/regress/simplifyvw.sql b/regress/core/simplifyvw.sql similarity index 100% rename from regress/simplifyvw.sql rename to regress/core/simplifyvw.sql diff --git a/regress/simplifyvw_expected b/regress/core/simplifyvw_expected similarity index 100% rename from regress/simplifyvw_expected rename to regress/core/simplifyvw_expected diff --git a/regress/size.sql b/regress/core/size.sql similarity index 100% rename from regress/size.sql rename to regress/core/size.sql diff --git a/regress/size_expected b/regress/core/size_expected similarity index 100% rename from regress/size_expected rename to regress/core/size_expected diff --git a/regress/snap.sql b/regress/core/snap.sql similarity index 100% rename from regress/snap.sql rename to regress/core/snap.sql diff --git a/regress/snap_expected b/regress/core/snap_expected similarity index 100% rename from regress/snap_expected rename to regress/core/snap_expected diff --git a/regress/snaptogrid.sql b/regress/core/snaptogrid.sql similarity index 100% rename from regress/snaptogrid.sql rename to regress/core/snaptogrid.sql diff --git a/regress/snaptogrid_expected b/regress/core/snaptogrid_expected similarity index 100% rename from regress/snaptogrid_expected rename to regress/core/snaptogrid_expected diff --git a/regress/split.sql b/regress/core/split.sql similarity index 100% rename from regress/split.sql rename to regress/core/split.sql diff --git a/regress/split_expected b/regress/core/split_expected similarity index 100% rename from regress/split_expected rename to regress/core/split_expected diff --git a/regress/sql-mm-circularstring.sql b/regress/core/sql-mm-circularstring.sql similarity index 100% rename from regress/sql-mm-circularstring.sql rename to regress/core/sql-mm-circularstring.sql diff --git a/regress/sql-mm-circularstring_expected b/regress/core/sql-mm-circularstring_expected similarity index 100% rename from regress/sql-mm-circularstring_expected rename to regress/core/sql-mm-circularstring_expected diff --git a/regress/sql-mm-compoundcurve.sql b/regress/core/sql-mm-compoundcurve.sql similarity index 100% rename from regress/sql-mm-compoundcurve.sql rename to regress/core/sql-mm-compoundcurve.sql diff --git a/regress/sql-mm-compoundcurve_expected b/regress/core/sql-mm-compoundcurve_expected similarity index 100% rename from regress/sql-mm-compoundcurve_expected rename to regress/core/sql-mm-compoundcurve_expected diff --git a/regress/sql-mm-curvepoly.sql b/regress/core/sql-mm-curvepoly.sql similarity index 100% rename from regress/sql-mm-curvepoly.sql rename to regress/core/sql-mm-curvepoly.sql diff --git a/regress/sql-mm-curvepoly_expected b/regress/core/sql-mm-curvepoly_expected similarity index 100% rename from regress/sql-mm-curvepoly_expected rename to regress/core/sql-mm-curvepoly_expected diff --git a/regress/sql-mm-general.sql b/regress/core/sql-mm-general.sql similarity index 100% rename from regress/sql-mm-general.sql rename to regress/core/sql-mm-general.sql diff --git a/regress/sql-mm-general_expected b/regress/core/sql-mm-general_expected similarity index 100% rename from regress/sql-mm-general_expected rename to regress/core/sql-mm-general_expected diff --git a/regress/sql-mm-multicurve.sql b/regress/core/sql-mm-multicurve.sql similarity index 100% rename from regress/sql-mm-multicurve.sql rename to regress/core/sql-mm-multicurve.sql diff --git a/regress/sql-mm-multicurve_expected b/regress/core/sql-mm-multicurve_expected similarity index 100% rename from regress/sql-mm-multicurve_expected rename to regress/core/sql-mm-multicurve_expected diff --git a/regress/sql-mm-multisurface.sql b/regress/core/sql-mm-multisurface.sql similarity index 100% rename from regress/sql-mm-multisurface.sql rename to regress/core/sql-mm-multisurface.sql diff --git a/regress/sql-mm-multisurface_expected b/regress/core/sql-mm-multisurface_expected similarity index 100% rename from regress/sql-mm-multisurface_expected rename to regress/core/sql-mm-multisurface_expected diff --git a/regress/sql-mm-serialize.sql b/regress/core/sql-mm-serialize.sql similarity index 100% rename from regress/sql-mm-serialize.sql rename to regress/core/sql-mm-serialize.sql diff --git a/regress/sql-mm-serialize_expected b/regress/core/sql-mm-serialize_expected similarity index 100% rename from regress/sql-mm-serialize_expected rename to regress/core/sql-mm-serialize_expected diff --git a/regress/subdivide.sql b/regress/core/subdivide.sql similarity index 100% rename from regress/subdivide.sql rename to regress/core/subdivide.sql diff --git a/regress/subdivide_expected b/regress/core/subdivide_expected similarity index 100% rename from regress/subdivide_expected rename to regress/core/subdivide_expected diff --git a/regress/summary.sql b/regress/core/summary.sql similarity index 100% rename from regress/summary.sql rename to regress/core/summary.sql diff --git a/regress/summary_expected b/regress/core/summary_expected similarity index 100% rename from regress/summary_expected rename to regress/core/summary_expected diff --git a/regress/swapordinates.sql b/regress/core/swapordinates.sql similarity index 100% rename from regress/swapordinates.sql rename to regress/core/swapordinates.sql diff --git a/regress/swapordinates_expected b/regress/core/swapordinates_expected similarity index 100% rename from regress/swapordinates_expected rename to regress/core/swapordinates_expected diff --git a/regress/temporal.sql b/regress/core/temporal.sql similarity index 100% rename from regress/temporal.sql rename to regress/core/temporal.sql diff --git a/regress/temporal_expected b/regress/core/temporal_expected similarity index 100% rename from regress/temporal_expected rename to regress/core/temporal_expected diff --git a/regress/temporal_knn.sql b/regress/core/temporal_knn.sql similarity index 100% rename from regress/temporal_knn.sql rename to regress/core/temporal_knn.sql diff --git a/regress/temporal_knn_expected b/regress/core/temporal_knn_expected similarity index 100% rename from regress/temporal_knn_expected rename to regress/core/temporal_knn_expected diff --git a/regress/ticket_3697.wkt b/regress/core/ticket_3697.wkt similarity index 100% rename from regress/ticket_3697.wkt rename to regress/core/ticket_3697.wkt diff --git a/regress/tickets.sql b/regress/core/tickets.sql similarity index 100% rename from regress/tickets.sql rename to regress/core/tickets.sql diff --git a/regress/tickets_expected b/regress/core/tickets_expected similarity index 100% rename from regress/tickets_expected rename to regress/core/tickets_expected diff --git a/regress/twkb.sql b/regress/core/twkb.sql similarity index 100% rename from regress/twkb.sql rename to regress/core/twkb.sql diff --git a/regress/twkb_expected b/regress/core/twkb_expected similarity index 100% rename from regress/twkb_expected rename to regress/core/twkb_expected diff --git a/regress/typmod.sql b/regress/core/typmod.sql similarity index 100% rename from regress/typmod.sql rename to regress/core/typmod.sql diff --git a/regress/typmod_expected b/regress/core/typmod_expected similarity index 100% rename from regress/typmod_expected rename to regress/core/typmod_expected diff --git a/regress/unaryunion.sql b/regress/core/unaryunion.sql similarity index 100% rename from regress/unaryunion.sql rename to regress/core/unaryunion.sql diff --git a/regress/unaryunion_expected b/regress/core/unaryunion_expected similarity index 100% rename from regress/unaryunion_expected rename to regress/core/unaryunion_expected diff --git a/regress/voronoi.sql b/regress/core/voronoi.sql similarity index 100% rename from regress/voronoi.sql rename to regress/core/voronoi.sql diff --git a/regress/voronoi_expected b/regress/core/voronoi_expected similarity index 100% rename from regress/voronoi_expected rename to regress/core/voronoi_expected diff --git a/regress/wkb.sql b/regress/core/wkb.sql similarity index 100% rename from regress/wkb.sql rename to regress/core/wkb.sql diff --git a/regress/wkb_expected b/regress/core/wkb_expected similarity index 100% rename from regress/wkb_expected rename to regress/core/wkb_expected diff --git a/regress/wkt.sql b/regress/core/wkt.sql similarity index 100% rename from regress/wkt.sql rename to regress/core/wkt.sql diff --git a/regress/wkt_expected b/regress/core/wkt_expected similarity index 100% rename from regress/wkt_expected rename to regress/core/wkt_expected diff --git a/regress/wmsservers.sql b/regress/core/wmsservers.sql similarity index 100% rename from regress/wmsservers.sql rename to regress/core/wmsservers.sql diff --git a/regress/wmsservers_expected b/regress/core/wmsservers_expected similarity index 100% rename from regress/wmsservers_expected rename to regress/core/wmsservers_expected diff --git a/regress/wrapx.sql b/regress/core/wrapx.sql similarity index 100% rename from regress/wrapx.sql rename to regress/core/wrapx.sql diff --git a/regress/wrapx_expected b/regress/core/wrapx_expected similarity index 100% rename from regress/wrapx_expected rename to regress/core/wrapx_expected diff --git a/regress/loader/PointWithSchema.opts b/regress/loader/PointWithSchema.opts index 04264edc9..f830bb7b0 100644 --- a/regress/loader/PointWithSchema.opts +++ b/regress/loader/PointWithSchema.opts @@ -1,2 +1,2 @@ # Test loading a table with a schema. --g the_geom loader/PointWithSchema pgreg.loadedshp +-g the_geom ../loader/PointWithSchema pgreg.loadedshp diff --git a/regress/loader/mfile.opts b/regress/loader/mfile.opts index d5c63129a..d7f498c3e 100644 --- a/regress/loader/mfile.opts +++ b/regress/loader/mfile.opts @@ -1,2 +1,2 @@ # The DBF with short names mapped to longer --m loader/mfile_mapping.txt +-m ../loader/mfile_mapping.txt diff --git a/regress/sfcgal/Makefile.in b/regress/sfcgal/Makefile.in new file mode 100644 index 000000000..8326eb164 --- /dev/null +++ b/regress/sfcgal/Makefile.in @@ -0,0 +1,67 @@ +# ********************************************************************** +# * +# * PostGIS - Spatial Types for PostgreSQL +# * http://postgis.net +# * +# * Copyright (C) 2011-2012 Sandro Santilli +# * Copyright (C) 2009-2011 Paul Ramsey +# * Copyright (C) 2008-2009 Mark Cave-Ayland +# * +# * This is free software; you can redistribute and/or modify it under +# * the terms of the GNU General Public Licence. See the COPYING file. +# * +# ********************************************************************** + +PERL=@PERL@ +TMPDIR?=/tmp + +HAVE_SFCGAL=@HAVE_SFCGAL@ + +# 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 +# colons in drive letters will break PATH. +PGSQL_BINDIR=$(shell cd "@PGSQL_BINDIR@" && pwd) + +# +# Put path from pg_config into front of search path +# +PATH := $(PGSQL_BINDIR):$(PATH) +export PATH + + +TESTS = + +ifeq ($(HAVE_SFCGAL),yes) + # SFCGAL additionnal backend + TESTS += \ + regress_sfcgal \ + sfcgal/empty.sql \ + sfcgal/geography.sql \ + sfcgal/legacy.sql \ + sfcgal/measures.sql \ + sfcgal/regress_ogc_prep.sql \ + sfcgal/regress_ogc.sql \ + sfcgal/regress.sql \ + sfcgal/tickets.sql \ + sfcgal/concave_hull.sql \ + sfcgal/wmsservers.sql \ + sfcgal/approximatemedialaxis.sql + + SFCGALTESTFLAGS = --sfcgal +endif + + +all install uninstall: + +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 + +clean: