]> granicus.if.org Git - postgis/commitdiff
Split core and sfcgal tests allowing to run one w/out the other
authorSandro Santilli <strk@kbt.io>
Fri, 19 Oct 2018 23:06:30 +0000 (23:06 +0000)
committerSandro Santilli <strk@kbt.io>
Fri, 19 Oct 2018 23:06:30 +0000 (23:06 +0000)
Closes #4200

git-svn-id: http://svn.osgeo.org/postgis/trunk@16929 b70326c6-7e19-0410-871a-916f4a2858ee

239 files changed:
.gitignore
configure.ac
regress/Makefile.in
regress/core/Makefile.in [new file with mode: 0644]
regress/core/affine.sql [moved from regress/affine.sql with 100% similarity]
regress/core/affine_expected [moved from regress/affine_expected with 100% similarity]
regress/core/bestsrid.sql [moved from regress/bestsrid.sql with 100% similarity]
regress/core/bestsrid_expected [moved from regress/bestsrid_expected with 100% similarity]
regress/core/big_polygon.wkb [moved from regress/big_polygon.wkb with 100% similarity]
regress/core/binary.sql [moved from regress/binary.sql with 100% similarity]
regress/core/binary_expected [moved from regress/binary_expected with 100% similarity]
regress/core/boundary.sql [moved from regress/boundary.sql with 100% similarity]
regress/core/boundary_expected [moved from regress/boundary_expected with 100% similarity]
regress/core/chaikin.sql [moved from regress/chaikin.sql with 100% similarity]
regress/core/chaikin_expected [moved from regress/chaikin_expected with 100% similarity]
regress/core/clean.sql [moved from regress/clean.sql with 100% similarity]
regress/core/clean_expected [moved from regress/clean_expected with 100% similarity]
regress/core/clipbybox2d.sql [moved from regress/clipbybox2d.sql with 100% similarity]
regress/core/clipbybox2d_expected [moved from regress/clipbybox2d_expected with 100% similarity]
regress/core/cluster.sql [moved from regress/cluster.sql with 100% similarity]
regress/core/cluster_expected [moved from regress/cluster_expected with 100% similarity]
regress/core/concave_hull.sql [moved from regress/concave_hull.sql with 100% similarity]
regress/core/concave_hull_expected [moved from regress/concave_hull_expected with 100% similarity]
regress/core/concave_hull_hard.sql [moved from regress/concave_hull_hard.sql with 100% similarity]
regress/core/concave_hull_hard_expected [moved from regress/concave_hull_hard_expected with 100% similarity]
regress/core/ctors.sql [moved from regress/ctors.sql with 100% similarity]
regress/core/ctors_expected [moved from regress/ctors_expected with 100% similarity]
regress/core/curvetoline.sql [moved from regress/curvetoline.sql with 100% similarity]
regress/core/curvetoline_expected [moved from regress/curvetoline_expected with 100% similarity]
regress/core/delaunaytriangles.sql [moved from regress/delaunaytriangles.sql with 100% similarity]
regress/core/delaunaytriangles_expected [moved from regress/delaunaytriangles_expected with 100% similarity]
regress/core/dump.sql [moved from regress/dump.sql with 100% similarity]
regress/core/dump_expected [moved from regress/dump_expected with 100% similarity]
regress/core/dumppoints.sql [moved from regress/dumppoints.sql with 100% similarity]
regress/core/dumppoints_expected [moved from regress/dumppoints_expected with 100% similarity]
regress/core/empty.sql [moved from regress/empty.sql with 100% similarity]
regress/core/empty_expected [moved from regress/empty_expected with 100% similarity]
regress/core/estimatedextent.sql [moved from regress/estimatedextent.sql with 100% similarity]
regress/core/estimatedextent_expected [moved from regress/estimatedextent_expected with 100% similarity]
regress/core/filterm.sql [moved from regress/filterm.sql with 100% similarity]
regress/core/filterm_expected [moved from regress/filterm_expected with 100% similarity]
regress/core/forcecurve.sql [moved from regress/forcecurve.sql with 100% similarity]
regress/core/forcecurve_expected [moved from regress/forcecurve_expected with 100% similarity]
regress/core/frechet.sql [moved from regress/frechet.sql with 100% similarity]
regress/core/frechet_expected [moved from regress/frechet_expected with 100% similarity]
regress/core/geobuf.sql [moved from regress/geobuf.sql with 100% similarity]
regress/core/geobuf_expected [moved from regress/geobuf_expected with 100% similarity]
regress/core/geography.sql [moved from regress/geography.sql with 100% similarity]
regress/core/geography_centroid.sql [moved from regress/geography_centroid.sql with 100% similarity]
regress/core/geography_centroid_expected [moved from regress/geography_centroid_expected with 100% similarity]
regress/core/geography_covers.sql [moved from regress/geography_covers.sql with 100% similarity]
regress/core/geography_covers_expected [moved from regress/geography_covers_expected with 100% similarity]
regress/core/geography_expected [moved from regress/geography_expected with 100% similarity]
regress/core/geometric_median.sql [moved from regress/geometric_median.sql with 100% similarity]
regress/core/geometric_median_expected [moved from regress/geometric_median_expected with 100% similarity]
regress/core/hausdorff.sql [moved from regress/hausdorff.sql with 100% similarity]
regress/core/hausdorff_expected [moved from regress/hausdorff_expected with 100% similarity]
regress/core/in_encodedpolyline.sql [moved from regress/in_encodedpolyline.sql with 100% similarity]
regress/core/in_encodedpolyline_expected [moved from regress/in_encodedpolyline_expected with 100% similarity]
regress/core/in_geohash.sql [moved from regress/in_geohash.sql with 100% similarity]
regress/core/in_geohash_expected [moved from regress/in_geohash_expected with 100% similarity]
regress/core/in_geojson.sql [moved from regress/in_geojson.sql with 100% similarity]
regress/core/in_geojson_expected [moved from regress/in_geojson_expected with 100% similarity]
regress/core/in_gml.sql [moved from regress/in_gml.sql with 100% similarity]
regress/core/in_gml_expected [moved from regress/in_gml_expected with 100% similarity]
regress/core/in_kml.sql [moved from regress/in_kml.sql with 100% similarity]
regress/core/in_kml_expected [moved from regress/in_kml_expected with 100% similarity]
regress/core/interrupt.sql [moved from regress/interrupt.sql with 100% similarity]
regress/core/interrupt_buffer.sql [moved from regress/interrupt_buffer.sql with 100% similarity]
regress/core/interrupt_buffer_expected [moved from regress/interrupt_buffer_expected with 100% similarity]
regress/core/interrupt_expected [moved from regress/interrupt_expected with 100% similarity]
regress/core/interrupt_relate.sql [moved from regress/interrupt_relate.sql with 100% similarity]
regress/core/interrupt_relate_expected [moved from regress/interrupt_relate_expected with 100% similarity]
regress/core/iscollection.sql [moved from regress/iscollection.sql with 100% similarity]
regress/core/iscollection_expected [moved from regress/iscollection_expected with 100% similarity]
regress/core/isvaliddetail.sql [moved from regress/isvaliddetail.sql with 100% similarity]
regress/core/isvaliddetail_expected [moved from regress/isvaliddetail_expected with 100% similarity]
regress/core/knn.sql [moved from regress/knn.sql with 100% similarity]
regress/core/knn_expected [moved from regress/knn_expected with 100% similarity]
regress/core/knn_recheck.sql [moved from regress/knn_recheck.sql with 100% similarity]
regress/core/knn_recheck_expected [moved from regress/knn_recheck_expected with 100% similarity]
regress/core/legacy.sql [moved from regress/legacy.sql with 100% similarity]
regress/core/legacy_expected [moved from regress/legacy_expected with 100% similarity]
regress/core/long_xact.sql [moved from regress/long_xact.sql with 100% similarity]
regress/core/long_xact_expected [moved from regress/long_xact_expected with 100% similarity]
regress/core/lwgeom_regress.sql [moved from regress/lwgeom_regress.sql with 100% similarity]
regress/core/lwgeom_regress_expected [moved from regress/lwgeom_regress_expected with 100% similarity]
regress/core/measures.sql [moved from regress/measures.sql with 100% similarity]
regress/core/measures_expected [moved from regress/measures_expected with 100% similarity]
regress/core/minimum_bounding_circle.sql [moved from regress/minimum_bounding_circle.sql with 100% similarity]
regress/core/minimum_bounding_circle_expected [moved from regress/minimum_bounding_circle_expected with 100% similarity]
regress/core/minimum_clearance.sql [moved from regress/minimum_clearance.sql with 100% similarity]
regress/core/minimum_clearance_expected [moved from regress/minimum_clearance_expected with 100% similarity]
regress/core/mvt.sql [moved from regress/mvt.sql with 100% similarity]
regress/core/mvt_expected [moved from regress/mvt_expected with 100% similarity]
regress/core/mvt_jsonb.sql [moved from regress/mvt_jsonb.sql with 100% similarity]
regress/core/mvt_jsonb_expected [moved from regress/mvt_jsonb_expected with 100% similarity]
regress/core/node.sql [moved from regress/node.sql with 100% similarity]
regress/core/node_expected [moved from regress/node_expected with 100% similarity]
regress/core/normalize.sql [moved from regress/normalize.sql with 100% similarity]
regress/core/normalize_expected [moved from regress/normalize_expected with 100% similarity]
regress/core/offsetcurve.sql [moved from regress/offsetcurve.sql with 100% similarity]
regress/core/offsetcurve_expected [moved from regress/offsetcurve_expected with 100% similarity]
regress/core/operators.sql [moved from regress/operators.sql with 100% similarity]
regress/core/operators_expected [moved from regress/operators_expected with 100% similarity]
regress/core/orientation.sql [moved from regress/orientation.sql with 100% similarity]
regress/core/orientation_expected [moved from regress/orientation_expected with 100% similarity]
regress/core/oriented_envelope.sql [moved from regress/oriented_envelope.sql with 100% similarity]
regress/core/oriented_envelope_expected [moved from regress/oriented_envelope_expected with 100% similarity]
regress/core/out_geography.sql [moved from regress/out_geography.sql with 100% similarity]
regress/core/out_geography_expected [moved from regress/out_geography_expected with 100% similarity]
regress/core/out_geometry.sql [moved from regress/out_geometry.sql with 100% similarity]
regress/core/out_geometry_expected [moved from regress/out_geometry_expected with 100% similarity]
regress/core/polygonize.sql [moved from regress/polygonize.sql with 100% similarity]
regress/core/polygonize_expected [moved from regress/polygonize_expected with 100% similarity]
regress/core/polyhedralsurface.sql [moved from regress/polyhedralsurface.sql with 100% similarity]
regress/core/polyhedralsurface_expected [moved from regress/polyhedralsurface_expected with 100% similarity]
regress/core/postgis_type_name.sql [moved from regress/postgis_type_name.sql with 100% similarity]
regress/core/postgis_type_name_expected [moved from regress/postgis_type_name_expected with 100% similarity]
regress/core/quantize_coordinates.sql [moved from regress/quantize_coordinates.sql with 100% similarity]
regress/core/quantize_coordinates_expected [moved from regress/quantize_coordinates_expected with 100% similarity]
regress/core/regress.sql [moved from regress/regress.sql with 100% similarity]
regress/core/regress_bdpoly.sql [moved from regress/regress_bdpoly.sql with 100% similarity]
regress/core/regress_bdpoly_expected [moved from regress/regress_bdpoly_expected with 100% similarity]
regress/core/regress_big_polygon.sql [moved from regress/regress_big_polygon.sql with 100% similarity]
regress/core/regress_biginsert.sql [moved from regress/regress_biginsert.sql with 100% similarity]
regress/core/regress_brin_index.sql [moved from regress/regress_brin_index.sql with 100% similarity]
regress/core/regress_brin_index_3d.sql [moved from regress/regress_brin_index_3d.sql with 100% similarity]
regress/core/regress_brin_index_3d_expected [moved from regress/regress_brin_index_3d_expected with 100% similarity]
regress/core/regress_brin_index_expected [moved from regress/regress_brin_index_expected with 100% similarity]
regress/core/regress_brin_index_geography.sql [moved from regress/regress_brin_index_geography.sql with 100% similarity]
regress/core/regress_brin_index_geography_expected [moved from regress/regress_brin_index_geography_expected with 100% similarity]
regress/core/regress_buffer_params.sql [moved from regress/regress_buffer_params.sql with 100% similarity]
regress/core/regress_buffer_params_expected [moved from regress/regress_buffer_params_expected with 100% similarity]
regress/core/regress_expected [moved from regress/regress_expected with 100% similarity]
regress/core/regress_index.sql [moved from regress/regress_index.sql with 100% similarity]
regress/core/regress_index_expected [moved from regress/regress_index_expected with 100% similarity]
regress/core/regress_index_nulls.sql [moved from regress/regress_index_nulls.sql with 100% similarity]
regress/core/regress_index_nulls_expected [moved from regress/regress_index_nulls_expected with 100% similarity]
regress/core/regress_lots_of_3dpoints.sql [moved from regress/regress_lots_of_3dpoints.sql with 100% similarity]
regress/core/regress_lots_of_geographies.sql [moved from regress/regress_lots_of_geographies.sql with 100% similarity]
regress/core/regress_lots_of_nulls.sql [moved from regress/regress_lots_of_nulls.sql with 100% similarity]
regress/core/regress_lots_of_points.sql [moved from regress/regress_lots_of_points.sql with 100% similarity]
regress/core/regress_lrs.sql [moved from regress/regress_lrs.sql with 100% similarity]
regress/core/regress_lrs_expected [moved from regress/regress_lrs_expected with 100% similarity]
regress/core/regress_management.sql [moved from regress/regress_management.sql with 100% similarity]
regress/core/regress_management_expected [moved from regress/regress_management_expected with 100% similarity]
regress/core/regress_ogc.sql [moved from regress/regress_ogc.sql with 100% similarity]
regress/core/regress_ogc_cover.sql [moved from regress/regress_ogc_cover.sql with 100% similarity]
regress/core/regress_ogc_cover_expected [moved from regress/regress_ogc_cover_expected with 100% similarity]
regress/core/regress_ogc_expected [moved from regress/regress_ogc_expected with 100% similarity]
regress/core/regress_ogc_prep.sql [moved from regress/regress_ogc_prep.sql with 100% similarity]
regress/core/regress_ogc_prep_expected [moved from regress/regress_ogc_prep_expected with 100% similarity]
regress/core/regress_proj.sql [moved from regress/regress_proj.sql with 100% similarity]
regress/core/regress_proj_expected [moved from regress/regress_proj_expected with 100% similarity]
regress/core/regress_selectivity.sql [moved from regress/regress_selectivity.sql with 100% similarity]
regress/core/regress_selectivity_expected [moved from regress/regress_selectivity_expected with 100% similarity]
regress/core/regress_sfcgal.sql [moved from regress/regress_sfcgal.sql with 100% similarity]
regress/core/regress_sfcgal_expected [moved from regress/regress_sfcgal_expected with 100% similarity]
regress/core/regress_spgist_index_2d.data [moved from regress/regress_spgist_index_2d.data with 100% similarity]
regress/core/regress_spgist_index_2d.sql [moved from regress/regress_spgist_index_2d.sql with 100% similarity]
regress/core/regress_spgist_index_2d_expected [moved from regress/regress_spgist_index_2d_expected with 100% similarity]
regress/core/regress_spgist_index_3d.data [moved from regress/regress_spgist_index_3d.data with 100% similarity]
regress/core/regress_spgist_index_3d.sql [moved from regress/regress_spgist_index_3d.sql with 100% similarity]
regress/core/regress_spgist_index_3d_expected [moved from regress/regress_spgist_index_3d_expected with 100% similarity]
regress/core/relate.sql [moved from regress/relate.sql with 100% similarity]
regress/core/relate_bnr.sql [moved from regress/relate_bnr.sql with 100% similarity]
regress/core/relate_bnr_expected [moved from regress/relate_bnr_expected with 100% similarity]
regress/core/relate_expected [moved from regress/relate_expected with 100% similarity]
regress/core/relatematch.sql [moved from regress/relatematch.sql with 100% similarity]
regress/core/relatematch_expected [moved from regress/relatematch_expected with 100% similarity]
regress/core/remove_repeated_points.sql [moved from regress/remove_repeated_points.sql with 100% similarity]
regress/core/remove_repeated_points_expected [moved from regress/remove_repeated_points_expected with 100% similarity]
regress/core/removepoint.sql [moved from regress/removepoint.sql with 100% similarity]
regress/core/removepoint_expected [moved from regress/removepoint_expected with 100% similarity]
regress/core/reverse.sql [moved from regress/reverse.sql with 100% similarity]
regress/core/reverse_expected [moved from regress/reverse_expected with 100% similarity]
regress/core/setpoint.sql [moved from regress/setpoint.sql with 100% similarity]
regress/core/setpoint_expected [moved from regress/setpoint_expected with 100% similarity]
regress/core/sharedpaths.sql [moved from regress/sharedpaths.sql with 100% similarity]
regress/core/sharedpaths_expected [moved from regress/sharedpaths_expected with 100% similarity]
regress/core/simplify.sql [moved from regress/simplify.sql with 100% similarity]
regress/core/simplify_expected [moved from regress/simplify_expected with 100% similarity]
regress/core/simplifyvw.sql [moved from regress/simplifyvw.sql with 100% similarity]
regress/core/simplifyvw_expected [moved from regress/simplifyvw_expected with 100% similarity]
regress/core/size.sql [moved from regress/size.sql with 100% similarity]
regress/core/size_expected [moved from regress/size_expected with 100% similarity]
regress/core/snap.sql [moved from regress/snap.sql with 100% similarity]
regress/core/snap_expected [moved from regress/snap_expected with 100% similarity]
regress/core/snaptogrid.sql [moved from regress/snaptogrid.sql with 100% similarity]
regress/core/snaptogrid_expected [moved from regress/snaptogrid_expected with 100% similarity]
regress/core/split.sql [moved from regress/split.sql with 100% similarity]
regress/core/split_expected [moved from regress/split_expected with 100% similarity]
regress/core/sql-mm-circularstring.sql [moved from regress/sql-mm-circularstring.sql with 100% similarity]
regress/core/sql-mm-circularstring_expected [moved from regress/sql-mm-circularstring_expected with 100% similarity]
regress/core/sql-mm-compoundcurve.sql [moved from regress/sql-mm-compoundcurve.sql with 100% similarity]
regress/core/sql-mm-compoundcurve_expected [moved from regress/sql-mm-compoundcurve_expected with 100% similarity]
regress/core/sql-mm-curvepoly.sql [moved from regress/sql-mm-curvepoly.sql with 100% similarity]
regress/core/sql-mm-curvepoly_expected [moved from regress/sql-mm-curvepoly_expected with 100% similarity]
regress/core/sql-mm-general.sql [moved from regress/sql-mm-general.sql with 100% similarity]
regress/core/sql-mm-general_expected [moved from regress/sql-mm-general_expected with 100% similarity]
regress/core/sql-mm-multicurve.sql [moved from regress/sql-mm-multicurve.sql with 100% similarity]
regress/core/sql-mm-multicurve_expected [moved from regress/sql-mm-multicurve_expected with 100% similarity]
regress/core/sql-mm-multisurface.sql [moved from regress/sql-mm-multisurface.sql with 100% similarity]
regress/core/sql-mm-multisurface_expected [moved from regress/sql-mm-multisurface_expected with 100% similarity]
regress/core/sql-mm-serialize.sql [moved from regress/sql-mm-serialize.sql with 100% similarity]
regress/core/sql-mm-serialize_expected [moved from regress/sql-mm-serialize_expected with 100% similarity]
regress/core/subdivide.sql [moved from regress/subdivide.sql with 100% similarity]
regress/core/subdivide_expected [moved from regress/subdivide_expected with 100% similarity]
regress/core/summary.sql [moved from regress/summary.sql with 100% similarity]
regress/core/summary_expected [moved from regress/summary_expected with 100% similarity]
regress/core/swapordinates.sql [moved from regress/swapordinates.sql with 100% similarity]
regress/core/swapordinates_expected [moved from regress/swapordinates_expected with 100% similarity]
regress/core/temporal.sql [moved from regress/temporal.sql with 100% similarity]
regress/core/temporal_expected [moved from regress/temporal_expected with 100% similarity]
regress/core/temporal_knn.sql [moved from regress/temporal_knn.sql with 100% similarity]
regress/core/temporal_knn_expected [moved from regress/temporal_knn_expected with 100% similarity]
regress/core/ticket_3697.wkt [moved from regress/ticket_3697.wkt with 100% similarity]
regress/core/tickets.sql [moved from regress/tickets.sql with 100% similarity]
regress/core/tickets_expected [moved from regress/tickets_expected with 100% similarity]
regress/core/twkb.sql [moved from regress/twkb.sql with 100% similarity]
regress/core/twkb_expected [moved from regress/twkb_expected with 100% similarity]
regress/core/typmod.sql [moved from regress/typmod.sql with 100% similarity]
regress/core/typmod_expected [moved from regress/typmod_expected with 100% similarity]
regress/core/unaryunion.sql [moved from regress/unaryunion.sql with 100% similarity]
regress/core/unaryunion_expected [moved from regress/unaryunion_expected with 100% similarity]
regress/core/voronoi.sql [moved from regress/voronoi.sql with 100% similarity]
regress/core/voronoi_expected [moved from regress/voronoi_expected with 100% similarity]
regress/core/wkb.sql [moved from regress/wkb.sql with 100% similarity]
regress/core/wkb_expected [moved from regress/wkb_expected with 100% similarity]
regress/core/wkt.sql [moved from regress/wkt.sql with 100% similarity]
regress/core/wkt_expected [moved from regress/wkt_expected with 100% similarity]
regress/core/wmsservers.sql [moved from regress/wmsservers.sql with 100% similarity]
regress/core/wmsservers_expected [moved from regress/wmsservers_expected with 100% similarity]
regress/core/wrapx.sql [moved from regress/wrapx.sql with 100% similarity]
regress/core/wrapx_expected [moved from regress/wrapx_expected with 100% similarity]
regress/loader/PointWithSchema.opts
regress/loader/mfile.opts
regress/sfcgal/Makefile.in [new file with mode: 0644]

index 0a754ee4b092d98a4492f23bf55eb9e257193a85..8c81da7b2188d3987d57addb02ff2844bb8c3a26 100644 (file)
@@ -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
index 645dd710f3ea9783888a3a0cb9316b59b7d39017..f231d724ff0adc6ecb01e34c5443eabb693c3464 100644 (file)
@@ -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
index 5278823fd600d47ed1fa8795a1387f166c8ff825..a5e3bdd2dc3a4acb1f36ffbe58c1688716038d68 100644 (file)
@@ -3,9 +3,7 @@
 # * PostGIS - Spatial Types for PostgreSQL
 # * http://postgis.net
 # *
-# * Copyright (C) 2011-2012 Sandro Santilli <strk@kbt.io>
-# * Copyright (C) 2009-2011 Paul Ramsey <pramsey@cleverelephant.ca>
-# * Copyright (C) 2008-2009 Mark Cave-Ayland
+# * Copyright (C) 2018 Sandro Santilli <strk@kbt.io>
 # *
 # * 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_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 (file)
index 0000000..e844ebf
--- /dev/null
@@ -0,0 +1,263 @@
+# **********************************************************************
+# *
+# * PostGIS - Spatial Types for PostgreSQL
+# * http://postgis.net
+# *
+# * Copyright (C) 2011-2012 Sandro Santilli <strk@kbt.io>
+# * Copyright (C) 2009-2011 Paul Ramsey <pramsey@cleverelephant.ca>
+# * 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:
similarity index 100%
rename from regress/affine.sql
rename to regress/core/affine.sql
similarity index 100%
rename from regress/binary.sql
rename to regress/core/binary.sql
similarity index 100%
rename from regress/chaikin.sql
rename to regress/core/chaikin.sql
similarity index 100%
rename from regress/clean.sql
rename to regress/core/clean.sql
similarity index 100%
rename from regress/cluster.sql
rename to regress/core/cluster.sql
similarity index 100%
rename from regress/ctors.sql
rename to regress/core/ctors.sql
similarity index 100%
rename from regress/dump.sql
rename to regress/core/dump.sql
similarity index 100%
rename from regress/empty.sql
rename to regress/core/empty.sql
similarity index 100%
rename from regress/filterm.sql
rename to regress/core/filterm.sql
similarity index 100%
rename from regress/frechet.sql
rename to regress/core/frechet.sql
similarity index 100%
rename from regress/geobuf.sql
rename to regress/core/geobuf.sql
similarity index 100%
rename from regress/in_gml.sql
rename to regress/core/in_gml.sql
similarity index 100%
rename from regress/in_kml.sql
rename to regress/core/in_kml.sql
similarity index 100%
rename from regress/knn.sql
rename to regress/core/knn.sql
similarity index 100%
rename from regress/legacy.sql
rename to regress/core/legacy.sql
similarity index 100%
rename from regress/mvt.sql
rename to regress/core/mvt.sql
similarity index 100%
rename from regress/node.sql
rename to regress/core/node.sql
similarity index 100%
rename from regress/regress.sql
rename to regress/core/regress.sql
similarity index 100%
rename from regress/relate.sql
rename to regress/core/relate.sql
similarity index 100%
rename from regress/reverse.sql
rename to regress/core/reverse.sql
similarity index 100%
rename from regress/size.sql
rename to regress/core/size.sql
similarity index 100%
rename from regress/snap.sql
rename to regress/core/snap.sql
similarity index 100%
rename from regress/split.sql
rename to regress/core/split.sql
similarity index 100%
rename from regress/summary.sql
rename to regress/core/summary.sql
similarity index 100%
rename from regress/tickets.sql
rename to regress/core/tickets.sql
similarity index 100%
rename from regress/twkb.sql
rename to regress/core/twkb.sql
similarity index 100%
rename from regress/typmod.sql
rename to regress/core/typmod.sql
similarity index 100%
rename from regress/voronoi.sql
rename to regress/core/voronoi.sql
similarity index 100%
rename from regress/wkb.sql
rename to regress/core/wkb.sql
similarity index 100%
rename from regress/wkt.sql
rename to regress/core/wkt.sql
similarity index 100%
rename from regress/wrapx.sql
rename to regress/core/wrapx.sql
index 04264edc9b4e01e6bd82851e2a9edf38c54fc139..f830bb7b0bd719dcf4bfec8607137cc8356093e3 100644 (file)
@@ -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
index d5c63129acc570308d37cfba7616e0939c6d4021..d7f498c3e485e6e5817793cedf2c462e21af15c2 100644 (file)
@@ -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 (file)
index 0000000..8326eb1
--- /dev/null
@@ -0,0 +1,67 @@
+# **********************************************************************
+# *
+# * PostGIS - Spatial Types for PostgreSQL
+# * http://postgis.net
+# *
+# * Copyright (C) 2011-2012 Sandro Santilli <strk@kbt.io>
+# * Copyright (C) 2009-2011 Paul Ramsey <pramsey@cleverelephant.ca>
+# * 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: