[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0alpha1-92-g8003f013a
git at osgeo.org
git at osgeo.org
Tue Jun 21 01:47:00 PDT 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 8003f013ad9e9cfb57d46f65f9af9cf5b7e0e969 (commit)
from 8916302c8fb51e49577c37610f515f1e22d820ec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8003f013ad9e9cfb57d46f65f9af9cf5b7e0e969
Author: Sandro Santilli <strk at kbt.io>
Date: Tue Jun 21 10:29:48 2022 +0200
Drop redundant variable topsrcdir, use top_srcdir
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6479ebb3e..1e93ecae8 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -196,9 +196,6 @@ postgis_revision.h:
.PHONY: utils liblwgeom ChangeLog raster
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(top_builddir)/regress/core/tests.mk
include $(top_srcdir)/regress/loader/tests.mk
include $(top_srcdir)/regress/dumper/tests.mk
diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index 5232d425e..2daf91ddf 100644
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -59,9 +59,6 @@ rtpostgis.sql: ../../rt_pg/rtpostgis.sql
$(PERL) -lpe "s'\\\$$libdir'$(REGRESS_INSTALLDIR)/lib'g" $< > $@
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(srcdir)/tests.mk
include $(top_srcdir)/regress/runtest.mk
diff --git a/raster/test/regress/tests.mk b/raster/test/regress/tests.mk
index 2c5d006bc..00918e134 100644
--- a/raster/test/regress/tests.mk
+++ b/raster/test/regress/tests.mk
@@ -13,128 +13,128 @@
override RUNTESTFLAGS := $(RUNTESTFLAGS) --raster
override RUNTESTFLAGS_INTERNAL := \
- --before-upgrade-script $(topsrcdir)/raster/test/regress/hooks/hook-before-upgrade-raster.sql \
+ --before-upgrade-script $(top_srcdir)/raster/test/regress/hooks/hook-before-upgrade-raster.sql \
$(RUNTESTFLAGS_INTERNAL) \
- --after-upgrade-script $(topsrcdir)/raster/test/regress/hooks/hook-after-upgrade-raster.sql
+ --after-upgrade-script $(top_srcdir)/raster/test/regress/hooks/hook-after-upgrade-raster.sql
RASTER_TEST_FIRST = \
- $(topsrcdir)/raster/test/regress/check_gdal \
- $(topsrcdir)/raster/test/regress/loader/load_outdb
+ $(top_srcdir)/raster/test/regress/check_gdal \
+ $(top_srcdir)/raster/test/regress/loader/load_outdb
RASTER_TEST_LAST = \
- $(topsrcdir)/raster/test/regress/clean
+ $(top_srcdir)/raster/test/regress/clean
RASTER_TEST_METADATA = \
- $(topsrcdir)/raster/test/regress/check_raster_columns \
- $(topsrcdir)/raster/test/regress/check_raster_overviews
+ $(top_srcdir)/raster/test/regress/check_raster_columns \
+ $(top_srcdir)/raster/test/regress/check_raster_overviews
RASTER_TEST_IO = \
- $(topsrcdir)/raster/test/regress/rt_io
+ $(top_srcdir)/raster/test/regress/rt_io
RASTER_TEST_BASIC_FUNC = \
- $(topsrcdir)/raster/test/regress/rt_bytea \
- $(topsrcdir)/raster/test/regress/rt_wkb \
- $(topsrcdir)/raster/test/regress/box3d \
- $(topsrcdir)/raster/test/regress/rt_addband \
- $(topsrcdir)/raster/test/regress/rt_band \
- $(topsrcdir)/raster/test/regress/rt_tile
+ $(top_srcdir)/raster/test/regress/rt_bytea \
+ $(top_srcdir)/raster/test/regress/rt_wkb \
+ $(top_srcdir)/raster/test/regress/box3d \
+ $(top_srcdir)/raster/test/regress/rt_addband \
+ $(top_srcdir)/raster/test/regress/rt_band \
+ $(top_srcdir)/raster/test/regress/rt_tile
RASTER_TEST_PROPS = \
- $(topsrcdir)/raster/test/regress/rt_dimensions \
- $(topsrcdir)/raster/test/regress/rt_scale \
- $(topsrcdir)/raster/test/regress/rt_pixelsize \
- $(topsrcdir)/raster/test/regress/rt_upperleft \
- $(topsrcdir)/raster/test/regress/rt_rotation \
- $(topsrcdir)/raster/test/regress/rt_georeference \
- $(topsrcdir)/raster/test/regress/rt_set_properties \
- $(topsrcdir)/raster/test/regress/rt_isempty \
- $(topsrcdir)/raster/test/regress/rt_hasnoband \
- $(topsrcdir)/raster/test/regress/rt_metadata \
- $(topsrcdir)/raster/test/regress/rt_rastertoworldcoord \
- $(topsrcdir)/raster/test/regress/rt_worldtorastercoord \
- $(topsrcdir)/raster/test/regress/rt_convexhull \
- $(topsrcdir)/raster/test/regress/rt_envelope
+ $(top_srcdir)/raster/test/regress/rt_dimensions \
+ $(top_srcdir)/raster/test/regress/rt_scale \
+ $(top_srcdir)/raster/test/regress/rt_pixelsize \
+ $(top_srcdir)/raster/test/regress/rt_upperleft \
+ $(top_srcdir)/raster/test/regress/rt_rotation \
+ $(top_srcdir)/raster/test/regress/rt_georeference \
+ $(top_srcdir)/raster/test/regress/rt_set_properties \
+ $(top_srcdir)/raster/test/regress/rt_isempty \
+ $(top_srcdir)/raster/test/regress/rt_hasnoband \
+ $(top_srcdir)/raster/test/regress/rt_metadata \
+ $(top_srcdir)/raster/test/regress/rt_rastertoworldcoord \
+ $(top_srcdir)/raster/test/regress/rt_worldtorastercoord \
+ $(top_srcdir)/raster/test/regress/rt_convexhull \
+ $(top_srcdir)/raster/test/regress/rt_envelope
RASTER_TEST_BANDPROPS = \
- $(topsrcdir)/raster/test/regress/rt_band_properties \
- $(topsrcdir)/raster/test/regress/rt_set_band_properties \
- $(topsrcdir)/raster/test/regress/rt_pixelaspolygons \
- $(topsrcdir)/raster/test/regress/rt_pixelaspoints \
- $(topsrcdir)/raster/test/regress/rt_pixelascentroids \
- $(topsrcdir)/raster/test/regress/rt_setvalues_array \
- $(topsrcdir)/raster/test/regress/rt_summarystats \
- $(topsrcdir)/raster/test/regress/rt_count \
- $(topsrcdir)/raster/test/regress/rt_histogram \
- $(topsrcdir)/raster/test/regress/rt_quantile \
- $(topsrcdir)/raster/test/regress/rt_valuecount \
- $(topsrcdir)/raster/test/regress/rt_valuepercent \
- $(topsrcdir)/raster/test/regress/rt_bandmetadata \
- $(topsrcdir)/raster/test/regress/rt_pixelvalue \
- $(topsrcdir)/raster/test/regress/rt_neighborhood \
- $(topsrcdir)/raster/test/regress/rt_nearestvalue \
- $(topsrcdir)/raster/test/regress/rt_pixelofvalue \
- $(topsrcdir)/raster/test/regress/rt_polygon \
- $(topsrcdir)/raster/test/regress/rt_setbandpath
+ $(top_srcdir)/raster/test/regress/rt_band_properties \
+ $(top_srcdir)/raster/test/regress/rt_set_band_properties \
+ $(top_srcdir)/raster/test/regress/rt_pixelaspolygons \
+ $(top_srcdir)/raster/test/regress/rt_pixelaspoints \
+ $(top_srcdir)/raster/test/regress/rt_pixelascentroids \
+ $(top_srcdir)/raster/test/regress/rt_setvalues_array \
+ $(top_srcdir)/raster/test/regress/rt_summarystats \
+ $(top_srcdir)/raster/test/regress/rt_count \
+ $(top_srcdir)/raster/test/regress/rt_histogram \
+ $(top_srcdir)/raster/test/regress/rt_quantile \
+ $(top_srcdir)/raster/test/regress/rt_valuecount \
+ $(top_srcdir)/raster/test/regress/rt_valuepercent \
+ $(top_srcdir)/raster/test/regress/rt_bandmetadata \
+ $(top_srcdir)/raster/test/regress/rt_pixelvalue \
+ $(top_srcdir)/raster/test/regress/rt_neighborhood \
+ $(top_srcdir)/raster/test/regress/rt_nearestvalue \
+ $(top_srcdir)/raster/test/regress/rt_pixelofvalue \
+ $(top_srcdir)/raster/test/regress/rt_polygon \
+ $(top_srcdir)/raster/test/regress/rt_setbandpath
RASTER_TEST_UTILITY = \
- $(topsrcdir)/raster/test/regress/rt_utility \
- $(topsrcdir)/raster/test/regress/rt_fromgdalraster \
- $(topsrcdir)/raster/test/regress/rt_asgdalraster \
- $(topsrcdir)/raster/test/regress/rt_astiff \
- $(topsrcdir)/raster/test/regress/rt_asjpeg \
- $(topsrcdir)/raster/test/regress/rt_aspng \
- $(topsrcdir)/raster/test/regress/rt_reclass \
- $(topsrcdir)/raster/test/regress/rt_gdalwarp \
- $(topsrcdir)/raster/test/regress/rt_gdalcontour \
- $(topsrcdir)/raster/test/regress/rt_asraster \
- $(topsrcdir)/raster/test/regress/rt_dumpvalues \
- $(topsrcdir)/raster/test/regress/rt_makeemptycoverage \
- $(topsrcdir)/raster/test/regress/rt_createoverview
+ $(top_srcdir)/raster/test/regress/rt_utility \
+ $(top_srcdir)/raster/test/regress/rt_fromgdalraster \
+ $(top_srcdir)/raster/test/regress/rt_asgdalraster \
+ $(top_srcdir)/raster/test/regress/rt_astiff \
+ $(top_srcdir)/raster/test/regress/rt_asjpeg \
+ $(top_srcdir)/raster/test/regress/rt_aspng \
+ $(top_srcdir)/raster/test/regress/rt_reclass \
+ $(top_srcdir)/raster/test/regress/rt_gdalwarp \
+ $(top_srcdir)/raster/test/regress/rt_gdalcontour \
+ $(top_srcdir)/raster/test/regress/rt_asraster \
+ $(top_srcdir)/raster/test/regress/rt_dumpvalues \
+ $(top_srcdir)/raster/test/regress/rt_makeemptycoverage \
+ $(top_srcdir)/raster/test/regress/rt_createoverview
RASTER_TEST_MAPALGEBRA = \
- $(topsrcdir)/raster/test/regress/rt_mapalgebraexpr \
- $(topsrcdir)/raster/test/regress/rt_mapalgebrafct \
- $(topsrcdir)/raster/test/regress/rt_mapalgebraexpr_2raster \
- $(topsrcdir)/raster/test/regress/rt_mapalgebrafct_2raster \
- $(topsrcdir)/raster/test/regress/rt_mapalgebrafctngb \
- $(topsrcdir)/raster/test/regress/rt_mapalgebrafctngb_userfunc \
- $(topsrcdir)/raster/test/regress/rt_intersection \
- $(topsrcdir)/raster/test/regress/rt_clip \
- $(topsrcdir)/raster/test/regress/rt_mapalgebra \
- $(topsrcdir)/raster/test/regress/rt_mapalgebra_expr \
- $(topsrcdir)/raster/test/regress/rt_mapalgebra_mask \
- $(topsrcdir)/raster/test/regress/rt_union \
- $(topsrcdir)/raster/test/regress/rt_invdistweight4ma \
- $(topsrcdir)/raster/test/regress/rt_4ma \
- $(topsrcdir)/raster/test/regress/rt_setvalues_geomval \
- $(topsrcdir)/raster/test/regress/rt_elevation_functions \
- $(topsrcdir)/raster/test/regress/rt_colormap \
- $(topsrcdir)/raster/test/regress/rt_grayscale
+ $(top_srcdir)/raster/test/regress/rt_mapalgebraexpr \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebrafct \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebraexpr_2raster \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebrafct_2raster \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebrafctngb \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebrafctngb_userfunc \
+ $(top_srcdir)/raster/test/regress/rt_intersection \
+ $(top_srcdir)/raster/test/regress/rt_clip \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebra \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebra_expr \
+ $(top_srcdir)/raster/test/regress/rt_mapalgebra_mask \
+ $(top_srcdir)/raster/test/regress/rt_union \
+ $(top_srcdir)/raster/test/regress/rt_invdistweight4ma \
+ $(top_srcdir)/raster/test/regress/rt_4ma \
+ $(top_srcdir)/raster/test/regress/rt_setvalues_geomval \
+ $(top_srcdir)/raster/test/regress/rt_elevation_functions \
+ $(top_srcdir)/raster/test/regress/rt_colormap \
+ $(top_srcdir)/raster/test/regress/rt_grayscale
RASTER_TEST_SREL = \
- $(topsrcdir)/raster/test/regress/rt_gist_relationships \
- $(topsrcdir)/raster/test/regress/rt_intersects \
- $(topsrcdir)/raster/test/regress/rt_samealignment \
- $(topsrcdir)/raster/test/regress/rt_geos_relationships \
- $(topsrcdir)/raster/test/regress/rt_iscoveragetile
+ $(top_srcdir)/raster/test/regress/rt_gist_relationships \
+ $(top_srcdir)/raster/test/regress/rt_intersects \
+ $(top_srcdir)/raster/test/regress/rt_samealignment \
+ $(top_srcdir)/raster/test/regress/rt_geos_relationships \
+ $(top_srcdir)/raster/test/regress/rt_iscoveragetile
RASTER_TEST_BUGS = \
- $(topsrcdir)/raster/test/regress/bug_test_car5 \
- $(topsrcdir)/raster/test/regress/permitted_gdal_drivers \
- $(topsrcdir)/raster/test/regress/tickets
+ $(top_srcdir)/raster/test/regress/bug_test_car5 \
+ $(top_srcdir)/raster/test/regress/permitted_gdal_drivers \
+ $(top_srcdir)/raster/test/regress/tickets
RASTER_TEST_LOADER = \
- $(topsrcdir)/raster/test/regress/loader/Basic \
- $(topsrcdir)/raster/test/regress/loader/Projected \
- $(topsrcdir)/raster/test/regress/loader/BasicCopy \
- $(topsrcdir)/raster/test/regress/loader/BasicFilename \
- $(topsrcdir)/raster/test/regress/loader/BasicOutDB \
- $(topsrcdir)/raster/test/regress/loader/Tiled10x10 \
- $(topsrcdir)/raster/test/regress/loader/Tiled10x10Copy \
- $(topsrcdir)/raster/test/regress/loader/Tiled8x8 \
- $(topsrcdir)/raster/test/regress/loader/TiledAuto \
- $(topsrcdir)/raster/test/regress/loader/TiledAutoSkipNoData \
- $(topsrcdir)/raster/test/regress/loader/TiledAutoCopyn
+ $(top_srcdir)/raster/test/regress/loader/Basic \
+ $(top_srcdir)/raster/test/regress/loader/Projected \
+ $(top_srcdir)/raster/test/regress/loader/BasicCopy \
+ $(top_srcdir)/raster/test/regress/loader/BasicFilename \
+ $(top_srcdir)/raster/test/regress/loader/BasicOutDB \
+ $(top_srcdir)/raster/test/regress/loader/Tiled10x10 \
+ $(top_srcdir)/raster/test/regress/loader/Tiled10x10Copy \
+ $(top_srcdir)/raster/test/regress/loader/Tiled8x8 \
+ $(top_srcdir)/raster/test/regress/loader/TiledAuto \
+ $(top_srcdir)/raster/test/regress/loader/TiledAutoSkipNoData \
+ $(top_srcdir)/raster/test/regress/loader/TiledAutoCopyn
RASTER_TESTS := $(RASTER_TEST_FIRST) \
$(RASTER_TEST_METADATA) $(RASTER_TEST_IO) $(RASTER_TEST_BASIC_FUNC) \
diff --git a/regress/Makefile.in b/regress/Makefile.in
index 3d227fb5e..7aad562f5 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -49,9 +49,6 @@ check: check-regress
check-unit:
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(builddir)/core/tests.mk
include $(srcdir)/loader/tests.mk
include $(srcdir)/dumper/tests.mk
diff --git a/regress/core/Makefile.in b/regress/core/Makefile.in
index 693f9b7be..d4be6dc14 100644
--- a/regress/core/Makefile.in
+++ b/regress/core/Makefile.in
@@ -17,9 +17,6 @@ top_builddir = @top_builddir@
PERL=@PERL@
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(builddir)/tests.mk
include $(top_srcdir)/regress/runtest.mk
diff --git a/regress/core/tests.mk.in b/regress/core/tests.mk.in
index ed0555cef..bf1fe5643 100644
--- a/regress/core/tests.mk.in
+++ b/regress/core/tests.mk.in
@@ -21,193 +21,193 @@ INTERRUPTTESTS=@INTERRUPTTESTS@
current_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
RUNTESTFLAGS_INTERNAL += \
- --before-upgrade-script $(topsrcdir)/regress/hooks/hook-before-upgrade.sql \
- --after-upgrade-script $(topsrcdir)/regress/hooks/hook-after-upgrade.sql \
- --after-create-script $(topsrcdir)/regress/hooks/hook-after-create.sql \
- --before-uninstall-script $(topsrcdir)/regress/hooks/hook-before-uninstall.sql
+ --before-upgrade-script $(top_srcdir)/regress/hooks/hook-before-upgrade.sql \
+ --after-upgrade-script $(top_srcdir)/regress/hooks/hook-after-upgrade.sql \
+ --after-create-script $(top_srcdir)/regress/hooks/hook-after-create.sql \
+ --before-uninstall-script $(top_srcdir)/regress/hooks/hook-before-uninstall.sql
TESTS += \
- $(topsrcdir)/regress/core/affine \
- $(topsrcdir)/regress/core/bestsrid \
- $(topsrcdir)/regress/core/binary \
- $(topsrcdir)/regress/core/boundary \
- $(topsrcdir)/regress/core/chaikin \
- $(topsrcdir)/regress/core/filterm \
- $(topsrcdir)/regress/core/cluster \
- $(topsrcdir)/regress/core/ctors \
- $(topsrcdir)/regress/core/curvetoline \
- $(topsrcdir)/regress/core/dump \
- $(topsrcdir)/regress/core/dumppoints \
- $(topsrcdir)/regress/core/dumpsegments \
- $(topsrcdir)/regress/core/empty \
- $(topsrcdir)/regress/core/estimatedextent \
- $(topsrcdir)/regress/core/forcecurve \
- $(topsrcdir)/regress/core/flatgeobuf \
- $(topsrcdir)/regress/core/geography \
- $(topsrcdir)/regress/core/geometric_median \
- $(topsrcdir)/regress/core/geos_noop \
- $(topsrcdir)/regress/core/hausdorff \
- $(topsrcdir)/regress/core/in_flatgeobuf \
- $(topsrcdir)/regress/core/in_geohash \
- $(topsrcdir)/regress/core/in_gml \
- $(topsrcdir)/regress/core/in_kml \
- $(topsrcdir)/regress/core/in_marc21 \
- $(topsrcdir)/regress/core/out_marc21 \
- $(topsrcdir)/regress/core/in_encodedpolyline \
- $(topsrcdir)/regress/core/iscollection \
- $(topsrcdir)/regress/core/legacy \
- $(topsrcdir)/regress/core/letters \
- $(topsrcdir)/regress/core/long_xact \
- $(topsrcdir)/regress/core/lwgeom_regress \
- $(topsrcdir)/regress/core/measures \
- $(topsrcdir)/regress/core/minimum_bounding_circle \
- $(topsrcdir)/regress/core/normalize \
- $(topsrcdir)/regress/core/operators \
- $(topsrcdir)/regress/core/orientation \
- $(topsrcdir)/regress/core/out_flatgeobuf \
- $(topsrcdir)/regress/core/out_geometry \
- $(topsrcdir)/regress/core/out_geography \
- $(topsrcdir)/regress/core/polygonize \
- $(topsrcdir)/regress/core/polyhedralsurface \
- $(topsrcdir)/regress/core/postgis_type_name \
- $(topsrcdir)/regress/core/quantize_coordinates \
- $(topsrcdir)/regress/core/regress \
- $(topsrcdir)/regress/core/regress_bdpoly \
- $(topsrcdir)/regress/core/regress_buffer_params \
- $(topsrcdir)/regress/core/regress_gist_index_nd \
- $(topsrcdir)/regress/core/regress_index \
- $(topsrcdir)/regress/core/regress_index_nulls \
- $(topsrcdir)/regress/core/regress_management \
- $(topsrcdir)/regress/core/regress_selectivity \
- $(topsrcdir)/regress/core/regress_lrs \
- $(topsrcdir)/regress/core/regress_ogc \
- $(topsrcdir)/regress/core/regress_ogc_cover \
- $(topsrcdir)/regress/core/regress_ogc_prep \
- $(topsrcdir)/regress/core/regress_proj_basic \
- $(topsrcdir)/regress/core/regress_proj_adhoc \
- $(topsrcdir)/regress/core/regress_proj_cache_overflow \
- $(topsrcdir)/regress/core/regress_proj_4890 \
- $(topsrcdir)/regress/core/relate \
- $(topsrcdir)/regress/core/remove_repeated_points \
- $(topsrcdir)/regress/core/removepoint \
- $(topsrcdir)/regress/core/reverse \
- $(topsrcdir)/regress/core/scroll \
- $(topsrcdir)/regress/core/setpoint \
- $(topsrcdir)/regress/core/simplify \
- $(topsrcdir)/regress/core/simplifyvw \
- $(topsrcdir)/regress/core/size \
- $(topsrcdir)/regress/core/snaptogrid \
- $(topsrcdir)/regress/core/split \
- $(topsrcdir)/regress/core/sql-mm-serialize \
- $(topsrcdir)/regress/core/sql-mm-circularstring \
- $(topsrcdir)/regress/core/sql-mm-compoundcurve \
- $(topsrcdir)/regress/core/sql-mm-curvepoly \
- $(topsrcdir)/regress/core/sql-mm-general \
- $(topsrcdir)/regress/core/sql-mm-multicurve \
- $(topsrcdir)/regress/core/sql-mm-multisurface \
- $(topsrcdir)/regress/core/swapordinates \
- $(topsrcdir)/regress/core/summary \
- $(topsrcdir)/regress/core/temporal \
- $(topsrcdir)/regress/core/temporal_knn \
- $(topsrcdir)/regress/core/tickets \
- $(topsrcdir)/regress/core/twkb \
- $(topsrcdir)/regress/core/typmod \
- $(topsrcdir)/regress/core/wkb \
- $(topsrcdir)/regress/core/wkt \
- $(topsrcdir)/regress/core/wmsservers \
- $(topsrcdir)/regress/core/offsetcurve \
- $(topsrcdir)/regress/core/relatematch \
- $(topsrcdir)/regress/core/isvaliddetail \
- $(topsrcdir)/regress/core/sharedpaths \
- $(topsrcdir)/regress/core/snap \
- $(topsrcdir)/regress/core/node \
- $(topsrcdir)/regress/core/unaryunion \
- $(topsrcdir)/regress/core/clean \
- $(topsrcdir)/regress/core/relate_bnr \
- $(topsrcdir)/regress/core/delaunaytriangles \
- $(topsrcdir)/regress/core/clipbybox2d \
- $(topsrcdir)/regress/core/subdivide \
- $(topsrcdir)/regress/core/voronoi \
- $(topsrcdir)/regress/core/regress_brin_index \
- $(topsrcdir)/regress/core/regress_brin_index_3d \
- $(topsrcdir)/regress/core/regress_brin_index_geography \
- $(topsrcdir)/regress/core/minimum_clearance \
- $(topsrcdir)/regress/core/oriented_envelope \
- $(topsrcdir)/regress/core/point_coordinates \
- $(topsrcdir)/regress/core/out_geojson \
- $(topsrcdir)/regress/core/wrapx
+ $(top_srcdir)/regress/core/affine \
+ $(top_srcdir)/regress/core/bestsrid \
+ $(top_srcdir)/regress/core/binary \
+ $(top_srcdir)/regress/core/boundary \
+ $(top_srcdir)/regress/core/chaikin \
+ $(top_srcdir)/regress/core/filterm \
+ $(top_srcdir)/regress/core/cluster \
+ $(top_srcdir)/regress/core/ctors \
+ $(top_srcdir)/regress/core/curvetoline \
+ $(top_srcdir)/regress/core/dump \
+ $(top_srcdir)/regress/core/dumppoints \
+ $(top_srcdir)/regress/core/dumpsegments \
+ $(top_srcdir)/regress/core/empty \
+ $(top_srcdir)/regress/core/estimatedextent \
+ $(top_srcdir)/regress/core/forcecurve \
+ $(top_srcdir)/regress/core/flatgeobuf \
+ $(top_srcdir)/regress/core/geography \
+ $(top_srcdir)/regress/core/geometric_median \
+ $(top_srcdir)/regress/core/geos_noop \
+ $(top_srcdir)/regress/core/hausdorff \
+ $(top_srcdir)/regress/core/in_flatgeobuf \
+ $(top_srcdir)/regress/core/in_geohash \
+ $(top_srcdir)/regress/core/in_gml \
+ $(top_srcdir)/regress/core/in_kml \
+ $(top_srcdir)/regress/core/in_marc21 \
+ $(top_srcdir)/regress/core/out_marc21 \
+ $(top_srcdir)/regress/core/in_encodedpolyline \
+ $(top_srcdir)/regress/core/iscollection \
+ $(top_srcdir)/regress/core/legacy \
+ $(top_srcdir)/regress/core/letters \
+ $(top_srcdir)/regress/core/long_xact \
+ $(top_srcdir)/regress/core/lwgeom_regress \
+ $(top_srcdir)/regress/core/measures \
+ $(top_srcdir)/regress/core/minimum_bounding_circle \
+ $(top_srcdir)/regress/core/normalize \
+ $(top_srcdir)/regress/core/operators \
+ $(top_srcdir)/regress/core/orientation \
+ $(top_srcdir)/regress/core/out_flatgeobuf \
+ $(top_srcdir)/regress/core/out_geometry \
+ $(top_srcdir)/regress/core/out_geography \
+ $(top_srcdir)/regress/core/polygonize \
+ $(top_srcdir)/regress/core/polyhedralsurface \
+ $(top_srcdir)/regress/core/postgis_type_name \
+ $(top_srcdir)/regress/core/quantize_coordinates \
+ $(top_srcdir)/regress/core/regress \
+ $(top_srcdir)/regress/core/regress_bdpoly \
+ $(top_srcdir)/regress/core/regress_buffer_params \
+ $(top_srcdir)/regress/core/regress_gist_index_nd \
+ $(top_srcdir)/regress/core/regress_index \
+ $(top_srcdir)/regress/core/regress_index_nulls \
+ $(top_srcdir)/regress/core/regress_management \
+ $(top_srcdir)/regress/core/regress_selectivity \
+ $(top_srcdir)/regress/core/regress_lrs \
+ $(top_srcdir)/regress/core/regress_ogc \
+ $(top_srcdir)/regress/core/regress_ogc_cover \
+ $(top_srcdir)/regress/core/regress_ogc_prep \
+ $(top_srcdir)/regress/core/regress_proj_basic \
+ $(top_srcdir)/regress/core/regress_proj_adhoc \
+ $(top_srcdir)/regress/core/regress_proj_cache_overflow \
+ $(top_srcdir)/regress/core/regress_proj_4890 \
+ $(top_srcdir)/regress/core/relate \
+ $(top_srcdir)/regress/core/remove_repeated_points \
+ $(top_srcdir)/regress/core/removepoint \
+ $(top_srcdir)/regress/core/reverse \
+ $(top_srcdir)/regress/core/scroll \
+ $(top_srcdir)/regress/core/setpoint \
+ $(top_srcdir)/regress/core/simplify \
+ $(top_srcdir)/regress/core/simplifyvw \
+ $(top_srcdir)/regress/core/size \
+ $(top_srcdir)/regress/core/snaptogrid \
+ $(top_srcdir)/regress/core/split \
+ $(top_srcdir)/regress/core/sql-mm-serialize \
+ $(top_srcdir)/regress/core/sql-mm-circularstring \
+ $(top_srcdir)/regress/core/sql-mm-compoundcurve \
+ $(top_srcdir)/regress/core/sql-mm-curvepoly \
+ $(top_srcdir)/regress/core/sql-mm-general \
+ $(top_srcdir)/regress/core/sql-mm-multicurve \
+ $(top_srcdir)/regress/core/sql-mm-multisurface \
+ $(top_srcdir)/regress/core/swapordinates \
+ $(top_srcdir)/regress/core/summary \
+ $(top_srcdir)/regress/core/temporal \
+ $(top_srcdir)/regress/core/temporal_knn \
+ $(top_srcdir)/regress/core/tickets \
+ $(top_srcdir)/regress/core/twkb \
+ $(top_srcdir)/regress/core/typmod \
+ $(top_srcdir)/regress/core/wkb \
+ $(top_srcdir)/regress/core/wkt \
+ $(top_srcdir)/regress/core/wmsservers \
+ $(top_srcdir)/regress/core/offsetcurve \
+ $(top_srcdir)/regress/core/relatematch \
+ $(top_srcdir)/regress/core/isvaliddetail \
+ $(top_srcdir)/regress/core/sharedpaths \
+ $(top_srcdir)/regress/core/snap \
+ $(top_srcdir)/regress/core/node \
+ $(top_srcdir)/regress/core/unaryunion \
+ $(top_srcdir)/regress/core/clean \
+ $(top_srcdir)/regress/core/relate_bnr \
+ $(top_srcdir)/regress/core/delaunaytriangles \
+ $(top_srcdir)/regress/core/clipbybox2d \
+ $(top_srcdir)/regress/core/subdivide \
+ $(top_srcdir)/regress/core/voronoi \
+ $(top_srcdir)/regress/core/regress_brin_index \
+ $(top_srcdir)/regress/core/regress_brin_index_3d \
+ $(top_srcdir)/regress/core/regress_brin_index_geography \
+ $(top_srcdir)/regress/core/minimum_clearance \
+ $(top_srcdir)/regress/core/oriented_envelope \
+ $(top_srcdir)/regress/core/point_coordinates \
+ $(top_srcdir)/regress/core/out_geojson \
+ $(top_srcdir)/regress/core/wrapx
# Slow slow tests
TESTS_SLOW = \
- $(topsrcdir)/regress/core/concave_hull_hard \
- $(topsrcdir)/regress/core/knn_recheck
+ $(top_srcdir)/regress/core/concave_hull_hard \
+ $(top_srcdir)/regress/core/knn_recheck
ifeq ($(shell expr "$(POSTGIS_PGSQL_VERSION)" ">=" 120),1)
TESTS += \
- $(topsrcdir)/regress/core/computed_columns
+ $(top_srcdir)/regress/core/computed_columns
endif
ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 30700),1)
# GEOS-3.7 adds:
# ST_FrechetDistance
TESTS += \
- $(topsrcdir)/regress/core/frechet
+ $(top_srcdir)/regress/core/frechet
endif
ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 30800),1)
# GEOS-3.8 adds stable pointonsurface implementation
TESTS += \
- $(topsrcdir)/regress/core/geos38
+ $(top_srcdir)/regress/core/geos38
endif
ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 30900),1)
# GEOS-3.9 adds stable maximuminscribedcircle implementation
TESTS += \
- $(topsrcdir)/regress/core/geos39 \
- $(topsrcdir)/regress/core/fixedoverlay
+ $(top_srcdir)/regress/core/geos39 \
+ $(top_srcdir)/regress/core/fixedoverlay
endif
ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 31000),1)
TESTS += \
- $(topsrcdir)/regress/core/geos310
+ $(top_srcdir)/regress/core/geos310
endif
ifeq ($(shell expr "$(POSTGIS_GEOS_VERSION)" ">=" 31100),1)
TESTS += \
- $(topsrcdir)/regress/core/geos311
+ $(top_srcdir)/regress/core/geos311
# Only run the old internal concavehull tests for GEOS < 3.11
else
TESTS += \
- $(topsrcdir)/regress/core/concave_hull
+ $(top_srcdir)/regress/core/concave_hull
endif
ifeq ($(INTERRUPTTESTS),yes)
# Allow CI servers to configure --with-interrupt-tests
TESTS += \
- $(topsrcdir)/regress/core/interrupt \
- $(topsrcdir)/regress/core/interrupt_relate \
- $(topsrcdir)/regress/core/interrupt_buffer
+ $(top_srcdir)/regress/core/interrupt \
+ $(top_srcdir)/regress/core/interrupt_relate \
+ $(top_srcdir)/regress/core/interrupt_buffer
endif
ifeq ($(HAVE_JSON),yes)
# JSON-C adds:
# ST_GeomFromGeoJSON()
TESTS += \
- $(topsrcdir)/regress/core/in_geojson
+ $(top_srcdir)/regress/core/in_geojson
endif
ifeq ($(HAVE_SPGIST),yes)
TESTS += \
- $(topsrcdir)/regress/core/regress_spgist_index_2d \
- $(topsrcdir)/regress/core/regress_spgist_index_3d \
- $(topsrcdir)/regress/core/regress_spgist_index_nd
+ $(top_srcdir)/regress/core/regress_spgist_index_2d \
+ $(top_srcdir)/regress/core/regress_spgist_index_3d \
+ $(top_srcdir)/regress/core/regress_spgist_index_nd
endif
ifeq (@HAVE_PROTOBUF@,yes)
# protobuf-c adds:
# ST_AsMVT, ST_AsGeobuf
TESTS += \
- $(topsrcdir)/regress/core/mvt \
- $(topsrcdir)/regress/core/mvt_jsonb \
- $(topsrcdir)/regress/core/geobuf
+ $(top_srcdir)/regress/core/mvt \
+ $(top_srcdir)/regress/core/mvt_jsonb \
+ $(top_srcdir)/regress/core/geobuf
endif
diff --git a/regress/dumper/Makefile.in b/regress/dumper/Makefile.in
index db5eb3a48..2204b4c9b 100644
--- a/regress/dumper/Makefile.in
+++ b/regress/dumper/Makefile.in
@@ -17,9 +17,6 @@ top_builddir = @top_builddir@
PERL=@PERL@
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(srcdir)/tests.mk
include $(top_srcdir)/regress/runtest.mk
diff --git a/regress/dumper/tests.mk b/regress/dumper/tests.mk
index 18b4b71d1..d3417dc8f 100644
--- a/regress/dumper/tests.mk
+++ b/regress/dumper/tests.mk
@@ -11,9 +11,9 @@
# **********************************************************************
TESTS += \
- $(topsrcdir)/regress/dumper/mfiledmp \
- $(topsrcdir)/regress/dumper/literalsrid \
- $(topsrcdir)/regress/dumper/realtable \
- $(topsrcdir)/regress/dumper/nullsintable \
- $(topsrcdir)/regress/dumper/null3d \
- $(topsrcdir)/regress/dumper/withclause
+ $(top_srcdir)/regress/dumper/mfiledmp \
+ $(top_srcdir)/regress/dumper/literalsrid \
+ $(top_srcdir)/regress/dumper/realtable \
+ $(top_srcdir)/regress/dumper/nullsintable \
+ $(top_srcdir)/regress/dumper/null3d \
+ $(top_srcdir)/regress/dumper/withclause
diff --git a/regress/loader/Makefile.in b/regress/loader/Makefile.in
index fdc937aff..2204b4c9b 100644
--- a/regress/loader/Makefile.in
+++ b/regress/loader/Makefile.in
@@ -17,11 +17,7 @@ top_builddir = @top_builddir@
PERL=@PERL@
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(srcdir)/tests.mk
-
include $(top_srcdir)/regress/runtest.mk
check: check-regress
diff --git a/regress/loader/tests.mk b/regress/loader/tests.mk
index f6be1df56..30c7d07b2 100644
--- a/regress/loader/tests.mk
+++ b/regress/loader/tests.mk
@@ -12,31 +12,31 @@
TESTS += \
- $(topsrcdir)/regress/loader/Point \
- $(topsrcdir)/regress/loader/PointM \
- $(topsrcdir)/regress/loader/PointZ \
- $(topsrcdir)/regress/loader/MultiPoint \
- $(topsrcdir)/regress/loader/MultiPointM \
- $(topsrcdir)/regress/loader/MultiPointZ \
- $(topsrcdir)/regress/loader/Arc \
- $(topsrcdir)/regress/loader/ArcM \
- $(topsrcdir)/regress/loader/ArcZ \
- $(topsrcdir)/regress/loader/Polygon \
- $(topsrcdir)/regress/loader/PolygonM \
- $(topsrcdir)/regress/loader/PolygonZ \
- $(topsrcdir)/regress/loader/TSTPolygon \
- $(topsrcdir)/regress/loader/TSIPolygon \
- $(topsrcdir)/regress/loader/TSTIPolygon \
- $(topsrcdir)/regress/loader/PointWithSchema \
- $(topsrcdir)/regress/loader/NoTransPoint \
- $(topsrcdir)/regress/loader/NotReallyMultiPoint \
- $(topsrcdir)/regress/loader/MultiToSinglePoint \
- $(topsrcdir)/regress/loader/ReprojectPts \
- $(topsrcdir)/regress/loader/ReprojectPtsD \
- $(topsrcdir)/regress/loader/ReprojectPtsGeog \
- $(topsrcdir)/regress/loader/ReprojectPtsGeogD \
- $(topsrcdir)/regress/loader/Latin1 \
- $(topsrcdir)/regress/loader/Latin1-implicit \
- $(topsrcdir)/regress/loader/mfile \
- $(topsrcdir)/regress/loader/TestSkipANALYZE \
- $(topsrcdir)/regress/loader/TestANALYZE
+ $(top_srcdir)/regress/loader/Point \
+ $(top_srcdir)/regress/loader/PointM \
+ $(top_srcdir)/regress/loader/PointZ \
+ $(top_srcdir)/regress/loader/MultiPoint \
+ $(top_srcdir)/regress/loader/MultiPointM \
+ $(top_srcdir)/regress/loader/MultiPointZ \
+ $(top_srcdir)/regress/loader/Arc \
+ $(top_srcdir)/regress/loader/ArcM \
+ $(top_srcdir)/regress/loader/ArcZ \
+ $(top_srcdir)/regress/loader/Polygon \
+ $(top_srcdir)/regress/loader/PolygonM \
+ $(top_srcdir)/regress/loader/PolygonZ \
+ $(top_srcdir)/regress/loader/TSTPolygon \
+ $(top_srcdir)/regress/loader/TSIPolygon \
+ $(top_srcdir)/regress/loader/TSTIPolygon \
+ $(top_srcdir)/regress/loader/PointWithSchema \
+ $(top_srcdir)/regress/loader/NoTransPoint \
+ $(top_srcdir)/regress/loader/NotReallyMultiPoint \
+ $(top_srcdir)/regress/loader/MultiToSinglePoint \
+ $(top_srcdir)/regress/loader/ReprojectPts \
+ $(top_srcdir)/regress/loader/ReprojectPtsD \
+ $(top_srcdir)/regress/loader/ReprojectPtsGeog \
+ $(top_srcdir)/regress/loader/ReprojectPtsGeogD \
+ $(top_srcdir)/regress/loader/Latin1 \
+ $(top_srcdir)/regress/loader/Latin1-implicit \
+ $(top_srcdir)/regress/loader/mfile \
+ $(top_srcdir)/regress/loader/TestSkipANALYZE \
+ $(top_srcdir)/regress/loader/TestANALYZE
diff --git a/regress/runtest.mk b/regress/runtest.mk
index b337ee4ae..c051f0379 100644
--- a/regress/runtest.mk
+++ b/regress/runtest.mk
@@ -10,23 +10,23 @@
# *
# **********************************************************************
-abstopsrcdir := $(realpath $(top_srcdir))
-abssrcdir := $(realpath .)
+abs_top_srcdir := $(realpath $(top_srcdir))
+abs_srcdir := $(realpath .)
abs_top_builddir := $(realpath $(top_builddir))
-TESTS := $(patsubst $(topsrcdir)/%,$(abstopsrcdir)/%,$(TESTS))
-TESTS := $(patsubst $(abssrcdir)/%,./%,$(TESTS))
+TESTS := $(patsubst $(top_srcdir)/%,$(abs_top_srcdir)/%,$(TESTS))
+TESTS := $(patsubst $(abs_srcdir)/%,./%,$(TESTS))
.PHONY: check-regress
check-regress:
@echo "RUNTESTFLAGS: $(RUNTESTFLAGS)"
@echo "RUNTESTFLAGS_INTERNAL: $(RUNTESTFLAGS_INTERNAL)"
- POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(topsrcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(RUNTESTFLAGS_INTERNAL) $(TESTS)
+ POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(top_srcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(RUNTESTFLAGS_INTERNAL) $(TESTS)
@if echo "$(RUNTESTFLAGS)" | grep -vq -- --upgrade; then \
echo "Running upgrade test as RUNTESTFLAGS did not contain that"; \
- POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(topsrcdir)/regress/run_test.pl \
+ POSTGIS_TOP_BUILD_DIR=$(abs_top_builddir) $(PERL) $(top_srcdir)/regress/run_test.pl \
--upgrade \
$(RUNTESTFLAGS) \
$(RUNTESTFLAGS_INTERNAL) \
@@ -36,5 +36,5 @@ check-regress:
fi
check-long:
- $(PERL) $(topsrcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(TESTS) $(TESTS_SLOW)
+ $(PERL) $(top_srcdir)/regress/run_test.pl $(RUNTESTFLAGS) $(TESTS) $(TESTS_SLOW)
diff --git a/sfcgal/regress/Makefile.in b/sfcgal/regress/Makefile.in
index 72eda6822..93f889788 100644
--- a/sfcgal/regress/Makefile.in
+++ b/sfcgal/regress/Makefile.in
@@ -19,9 +19,6 @@ PERL=@PERL@
override RUNTESTFLAGS := $(RUNTESTFLAGS) --sfcgal
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(builddir)/tests.mk
include $(top_srcdir)/regress/runtest.mk
diff --git a/sfcgal/regress/tests.mk.in b/sfcgal/regress/tests.mk.in
index 0879e9f99..92d969f92 100644
--- a/sfcgal/regress/tests.mk.in
+++ b/sfcgal/regress/tests.mk.in
@@ -14,10 +14,10 @@ POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@
POSTGIS_SFCGAL_VERSION=@POSTGIS_SFCGAL_VERSION@
TESTS += \
- $(topsrcdir)/sfcgal/regress/regress_sfcgal \
- $(topsrcdir)/sfcgal/regress/approximatemedialaxis.sql
+ $(top_srcdir)/sfcgal/regress/regress_sfcgal \
+ $(top_srcdir)/sfcgal/regress/approximatemedialaxis.sql
ifeq ($(shell expr "$(POSTGIS_SFCGAL_VERSION)" ">=" 10401),1)
TESTS += \
- $(topsrcdir)/sfcgal/regress/alphashape.sql
+ $(top_srcdir)/sfcgal/regress/alphashape.sql
endif
diff --git a/topology/test/Makefile.in b/topology/test/Makefile.in
index 9f6c8020d..190c1c77f 100644
--- a/topology/test/Makefile.in
+++ b/topology/test/Makefile.in
@@ -58,8 +58,5 @@ check-regress: check-regress-deps
check-regress-deps: topo_predicates.sql load_topology.sql load_topology-4326.sql
-# TODO: drop this variable, use top_srcdir directly
-topsrcdir = $(top_srcdir)
-
include $(srcdir)/tests.mk
include $(top_srcdir)/regress/runtest.mk
diff --git a/topology/test/tests.mk b/topology/test/tests.mk
index 8f28e38f7..2fbb08541 100644
--- a/topology/test/tests.mk
+++ b/topology/test/tests.mk
@@ -13,69 +13,69 @@
override RUNTESTFLAGS := $(RUNTESTFLAGS) --topology
override RUNTESTFLAGS_INTERNAL := \
- --before-upgrade-script $(topsrcdir)/topology/test/regress/hooks/hook-before-upgrade-topology.sql \
+ --before-upgrade-script $(top_srcdir)/topology/test/regress/hooks/hook-before-upgrade-topology.sql \
$(RUNTESTFLAGS_INTERNAL) \
- --after-upgrade-script $(topsrcdir)/topology/test/regress/hooks/hook-after-upgrade-topology.sql
+ --after-upgrade-script $(top_srcdir)/topology/test/regress/hooks/hook-after-upgrade-topology.sql
TESTS += \
- $(topsrcdir)/topology/test/regress/addedge.sql \
- $(topsrcdir)/topology/test/regress/addface2.5d.sql \
- $(topsrcdir)/topology/test/regress/addface.sql \
- $(topsrcdir)/topology/test/regress/addnode.sql \
- $(topsrcdir)/topology/test/regress/addtopogeometrycolumn.sql \
- $(topsrcdir)/topology/test/regress/cleartopogeom.sql \
- $(topsrcdir)/topology/test/regress/copytopology.sql \
- $(topsrcdir)/topology/test/regress/createtopogeom.sql \
- $(topsrcdir)/topology/test/regress/createtopology.sql \
- $(topsrcdir)/topology/test/regress/droptopogeometrycolumn.sql \
- $(topsrcdir)/topology/test/regress/droptopology.sql \
- $(topsrcdir)/topology/test/regress/findlayer.sql \
- $(topsrcdir)/topology/test/regress/findtopology.sql \
- $(topsrcdir)/topology/test/regress/geometry_cast.sql \
- $(topsrcdir)/topology/test/regress/getedgebypoint.sql \
- $(topsrcdir)/topology/test/regress/getfacebypoint.sql \
- $(topsrcdir)/topology/test/regress/getfacecontainingpoint.sql \
- $(topsrcdir)/topology/test/regress/getnodebypoint.sql \
- $(topsrcdir)/topology/test/regress/getnodeedges.sql \
- $(topsrcdir)/topology/test/regress/getringedges.sql \
- $(topsrcdir)/topology/test/regress/gettopogeomelements.sql \
- $(topsrcdir)/topology/test/regress/gml.sql \
- $(topsrcdir)/topology/test/regress/layertrigger.sql \
- $(topsrcdir)/topology/test/regress/legacy_invalid.sql \
- $(topsrcdir)/topology/test/regress/legacy_predicate.sql \
- $(topsrcdir)/topology/test/regress/legacy_query.sql \
- $(topsrcdir)/topology/test/regress/legacy_validate.sql \
- $(topsrcdir)/topology/test/regress/polygonize.sql \
- $(topsrcdir)/topology/test/regress/sqlmm.sql \
- $(topsrcdir)/topology/test/regress/st_addedgemodface.sql \
- $(topsrcdir)/topology/test/regress/st_addedgenewfaces.sql \
- $(topsrcdir)/topology/test/regress/st_addisoedge.sql \
- $(topsrcdir)/topology/test/regress/st_addisonode.sql \
- $(topsrcdir)/topology/test/regress/st_changeedgegeom.sql \
- $(topsrcdir)/topology/test/regress/st_createtopogeo.sql \
- $(topsrcdir)/topology/test/regress/st_getfaceedges.sql \
- $(topsrcdir)/topology/test/regress/st_getfacegeometry.sql \
- $(topsrcdir)/topology/test/regress/st_modedgeheal.sql \
- $(topsrcdir)/topology/test/regress/st_modedgesplit.sql \
- $(topsrcdir)/topology/test/regress/st_moveisonode.sql \
- $(topsrcdir)/topology/test/regress/st_newedgeheal.sql \
- $(topsrcdir)/topology/test/regress/st_newedgessplit.sql \
- $(topsrcdir)/topology/test/regress/st_remedgemodface.sql \
- $(topsrcdir)/topology/test/regress/st_remedgenewface.sql \
- $(topsrcdir)/topology/test/regress/st_removeisoedge.sql \
- $(topsrcdir)/topology/test/regress/st_removeisonode.sql \
- $(topsrcdir)/topology/test/regress/st_simplify.sql \
- $(topsrcdir)/topology/test/regress/topo2.5d.sql \
- $(topsrcdir)/topology/test/regress/topoelementarray_agg.sql \
- $(topsrcdir)/topology/test/regress/topoelement.sql \
- $(topsrcdir)/topology/test/regress/topogeo_addlinestring.sql \
- $(topsrcdir)/topology/test/regress/topogeo_addpoint.sql \
- $(topsrcdir)/topology/test/regress/topogeo_addpolygon.sql \
- $(topsrcdir)/topology/test/regress/topogeom_addtopogeom.sql \
- $(topsrcdir)/topology/test/regress/topogeom_edit.sql \
- $(topsrcdir)/topology/test/regress/topogeometry_srid.sql \
- $(topsrcdir)/topology/test/regress/topogeometry_type.sql \
- $(topsrcdir)/topology/test/regress/topojson.sql \
- $(topsrcdir)/topology/test/regress/topologysummary.sql \
- $(topsrcdir)/topology/test/regress/totopogeom.sql \
- $(topsrcdir)/topology/test/regress/validatetopology.sql
+ $(top_srcdir)/topology/test/regress/addedge.sql \
+ $(top_srcdir)/topology/test/regress/addface2.5d.sql \
+ $(top_srcdir)/topology/test/regress/addface.sql \
+ $(top_srcdir)/topology/test/regress/addnode.sql \
+ $(top_srcdir)/topology/test/regress/addtopogeometrycolumn.sql \
+ $(top_srcdir)/topology/test/regress/cleartopogeom.sql \
+ $(top_srcdir)/topology/test/regress/copytopology.sql \
+ $(top_srcdir)/topology/test/regress/createtopogeom.sql \
+ $(top_srcdir)/topology/test/regress/createtopology.sql \
+ $(top_srcdir)/topology/test/regress/droptopogeometrycolumn.sql \
+ $(top_srcdir)/topology/test/regress/droptopology.sql \
+ $(top_srcdir)/topology/test/regress/findlayer.sql \
+ $(top_srcdir)/topology/test/regress/findtopology.sql \
+ $(top_srcdir)/topology/test/regress/geometry_cast.sql \
+ $(top_srcdir)/topology/test/regress/getedgebypoint.sql \
+ $(top_srcdir)/topology/test/regress/getfacebypoint.sql \
+ $(top_srcdir)/topology/test/regress/getfacecontainingpoint.sql \
+ $(top_srcdir)/topology/test/regress/getnodebypoint.sql \
+ $(top_srcdir)/topology/test/regress/getnodeedges.sql \
+ $(top_srcdir)/topology/test/regress/getringedges.sql \
+ $(top_srcdir)/topology/test/regress/gettopogeomelements.sql \
+ $(top_srcdir)/topology/test/regress/gml.sql \
+ $(top_srcdir)/topology/test/regress/layertrigger.sql \
+ $(top_srcdir)/topology/test/regress/legacy_invalid.sql \
+ $(top_srcdir)/topology/test/regress/legacy_predicate.sql \
+ $(top_srcdir)/topology/test/regress/legacy_query.sql \
+ $(top_srcdir)/topology/test/regress/legacy_validate.sql \
+ $(top_srcdir)/topology/test/regress/polygonize.sql \
+ $(top_srcdir)/topology/test/regress/sqlmm.sql \
+ $(top_srcdir)/topology/test/regress/st_addedgemodface.sql \
+ $(top_srcdir)/topology/test/regress/st_addedgenewfaces.sql \
+ $(top_srcdir)/topology/test/regress/st_addisoedge.sql \
+ $(top_srcdir)/topology/test/regress/st_addisonode.sql \
+ $(top_srcdir)/topology/test/regress/st_changeedgegeom.sql \
+ $(top_srcdir)/topology/test/regress/st_createtopogeo.sql \
+ $(top_srcdir)/topology/test/regress/st_getfaceedges.sql \
+ $(top_srcdir)/topology/test/regress/st_getfacegeometry.sql \
+ $(top_srcdir)/topology/test/regress/st_modedgeheal.sql \
+ $(top_srcdir)/topology/test/regress/st_modedgesplit.sql \
+ $(top_srcdir)/topology/test/regress/st_moveisonode.sql \
+ $(top_srcdir)/topology/test/regress/st_newedgeheal.sql \
+ $(top_srcdir)/topology/test/regress/st_newedgessplit.sql \
+ $(top_srcdir)/topology/test/regress/st_remedgemodface.sql \
+ $(top_srcdir)/topology/test/regress/st_remedgenewface.sql \
+ $(top_srcdir)/topology/test/regress/st_removeisoedge.sql \
+ $(top_srcdir)/topology/test/regress/st_removeisonode.sql \
+ $(top_srcdir)/topology/test/regress/st_simplify.sql \
+ $(top_srcdir)/topology/test/regress/topo2.5d.sql \
+ $(top_srcdir)/topology/test/regress/topoelementarray_agg.sql \
+ $(top_srcdir)/topology/test/regress/topoelement.sql \
+ $(top_srcdir)/topology/test/regress/topogeo_addlinestring.sql \
+ $(top_srcdir)/topology/test/regress/topogeo_addpoint.sql \
+ $(top_srcdir)/topology/test/regress/topogeo_addpolygon.sql \
+ $(top_srcdir)/topology/test/regress/topogeom_addtopogeom.sql \
+ $(top_srcdir)/topology/test/regress/topogeom_edit.sql \
+ $(top_srcdir)/topology/test/regress/topogeometry_srid.sql \
+ $(top_srcdir)/topology/test/regress/topogeometry_type.sql \
+ $(top_srcdir)/topology/test/regress/topojson.sql \
+ $(top_srcdir)/topology/test/regress/topologysummary.sql \
+ $(top_srcdir)/topology/test/regress/totopogeom.sql \
+ $(top_srcdir)/topology/test/regress/validatetopology.sql
diff --git a/utils/check_tests_enabled.sh b/utils/check_tests_enabled.sh
index c7a289c30..b8f69f83c 100755
--- a/utils/check_tests_enabled.sh
+++ b/utils/check_tests_enabled.sh
@@ -25,8 +25,8 @@ check_enabled() {
#echo "Suffix: ${suffix}"
#echo "Basedir: ${bd}"
- grep 'topsrcdir)' ${mk} |
- sed 's|.*topsrcdir)/||;s/ .*$//' |
+ grep 'top_srcdir)' ${mk} |
+ sed 's|.*top_srcdir)/||;s/ .*$//' |
sed 's|\\||' |
sed 's/\.sql$//' > ${TMPDIR}/enabled_tests
-----------------------------------------------------------------------
Summary of changes:
GNUmakefile.in | 3 -
raster/test/regress/Makefile.in | 3 -
raster/test/regress/tests.mk | 194 ++++++++++++++---------------
regress/Makefile.in | 3 -
regress/core/Makefile.in | 3 -
regress/core/tests.mk.in | 266 ++++++++++++++++++++--------------------
regress/dumper/Makefile.in | 3 -
regress/dumper/tests.mk | 12 +-
regress/loader/Makefile.in | 4 -
regress/loader/tests.mk | 56 ++++-----
regress/runtest.mk | 14 +--
sfcgal/regress/Makefile.in | 3 -
sfcgal/regress/tests.mk.in | 6 +-
topology/test/Makefile.in | 3 -
topology/test/tests.mk | 126 +++++++++----------
utils/check_tests_enabled.sh | 4 +-
16 files changed, 339 insertions(+), 364 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list