Index: test/Makefile.am ================================================================== --- test/Makefile.am +++ test/Makefile.am @@ -31,11 +31,12 @@ check_virtualtable6 \ check_mbrcache \ check_spatialindex \ check_exif \ check_relations_fncts \ - check_extra_relations_fncts + check_extra_relations_fncts \ + check_geoscvt_fncts AM_CFLAGS = -I@srcdir@/../src/headers AM_LDFLAGS = -L../src -lspatialite -lm $(GCOV_FLAGS) TESTS = $(check_PROGRAMS) Index: test/Makefile.in ================================================================== --- test/Makefile.in +++ test/Makefile.in @@ -1,11 +1,11 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # This program is distributed in the hope that it will be useful, @@ -48,11 +48,12 @@ check_virtualtable2$(EXEEXT) check_virtualtable3$(EXEEXT) \ check_virtualtable4$(EXEEXT) check_virtualtable5$(EXEEXT) \ check_virtualtable6$(EXEEXT) check_mbrcache$(EXEEXT) \ check_spatialindex$(EXEEXT) check_exif$(EXEEXT) \ check_relations_fncts$(EXEEXT) \ - check_extra_relations_fncts$(EXEEXT) + check_extra_relations_fncts$(EXEEXT) \ + check_geoscvt_fncts$(EXEEXT) subdir = test DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ @@ -101,10 +102,13 @@ check_geom_aux_OBJECTS = check_geom_aux.$(OBJEXT) check_geom_aux_LDADD = $(LDADD) check_geometry_cols_SOURCES = check_geometry_cols.c check_geometry_cols_OBJECTS = check_geometry_cols.$(OBJEXT) check_geometry_cols_LDADD = $(LDADD) +check_geoscvt_fncts_SOURCES = check_geoscvt_fncts.c +check_geoscvt_fncts_OBJECTS = check_geoscvt_fncts.$(OBJEXT) +check_geoscvt_fncts_LDADD = $(LDADD) check_init_SOURCES = check_init.c check_init_OBJECTS = check_init.$(OBJEXT) check_init_LDADD = $(LDADD) check_init2_SOURCES = check_init2.c check_init2_OBJECTS = check_init2.$(OBJEXT) @@ -186,12 +190,12 @@ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ SOURCES = check_create.c check_dbf_load.c check_endian.c check_exif.c \ check_extension.c check_extra_relations_fncts.c check_fdo1.c \ check_fdo2.c check_fdo3.c check_gaia_utf8.c check_gaia_util.c \ - check_geom_aux.c check_geometry_cols.c check_init.c \ - check_init2.c check_math_funcs.c check_mbrcache.c \ + check_geom_aux.c check_geometry_cols.c check_geoscvt_fncts.c \ + check_init.c check_init2.c check_math_funcs.c check_mbrcache.c \ check_recover_geom.c check_relations_fncts.c check_shp_load.c \ check_shp_load_3d.c check_spatialindex.c check_sql_stmt.c \ check_version.c check_virtualtable1.c check_virtualtable2.c \ check_virtualtable3.c check_virtualtable4.c \ check_virtualtable5.c check_virtualtable6.c check_xls_load.c \ @@ -199,14 +203,15 @@ shape_utf8_2.c DIST_SOURCES = check_create.c check_dbf_load.c check_endian.c \ check_exif.c check_extension.c check_extra_relations_fncts.c \ check_fdo1.c check_fdo2.c check_fdo3.c check_gaia_utf8.c \ check_gaia_util.c check_geom_aux.c check_geometry_cols.c \ - check_init.c check_init2.c check_math_funcs.c check_mbrcache.c \ - check_recover_geom.c check_relations_fncts.c check_shp_load.c \ - check_shp_load_3d.c check_spatialindex.c check_sql_stmt.c \ - check_version.c check_virtualtable1.c check_virtualtable2.c \ + check_geoscvt_fncts.c check_init.c check_init2.c \ + check_math_funcs.c check_mbrcache.c check_recover_geom.c \ + check_relations_fncts.c check_shp_load.c check_shp_load_3d.c \ + check_spatialindex.c check_sql_stmt.c check_version.c \ + check_virtualtable1.c check_virtualtable2.c \ check_virtualtable3.c check_virtualtable4.c \ check_virtualtable5.c check_virtualtable6.c check_xls_load.c \ shape_3d.c shape_cp1252.c shape_primitives.c shape_utf8_1.c \ shape_utf8_2.c ETAGS = etags @@ -2311,116 +2316,119 @@ rm -f $$list || exit $$?; \ test -n "$(EXEEXT)" || exit 0; \ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -check_create$(EXEEXT): $(check_create_OBJECTS) $(check_create_DEPENDENCIES) +check_create$(EXEEXT): $(check_create_OBJECTS) $(check_create_DEPENDENCIES) $(EXTRA_check_create_DEPENDENCIES) @rm -f check_create$(EXEEXT) $(LINK) $(check_create_OBJECTS) $(check_create_LDADD) $(LIBS) -check_dbf_load$(EXEEXT): $(check_dbf_load_OBJECTS) $(check_dbf_load_DEPENDENCIES) +check_dbf_load$(EXEEXT): $(check_dbf_load_OBJECTS) $(check_dbf_load_DEPENDENCIES) $(EXTRA_check_dbf_load_DEPENDENCIES) @rm -f check_dbf_load$(EXEEXT) $(LINK) $(check_dbf_load_OBJECTS) $(check_dbf_load_LDADD) $(LIBS) -check_endian$(EXEEXT): $(check_endian_OBJECTS) $(check_endian_DEPENDENCIES) +check_endian$(EXEEXT): $(check_endian_OBJECTS) $(check_endian_DEPENDENCIES) $(EXTRA_check_endian_DEPENDENCIES) @rm -f check_endian$(EXEEXT) $(LINK) $(check_endian_OBJECTS) $(check_endian_LDADD) $(LIBS) -check_exif$(EXEEXT): $(check_exif_OBJECTS) $(check_exif_DEPENDENCIES) +check_exif$(EXEEXT): $(check_exif_OBJECTS) $(check_exif_DEPENDENCIES) $(EXTRA_check_exif_DEPENDENCIES) @rm -f check_exif$(EXEEXT) $(LINK) $(check_exif_OBJECTS) $(check_exif_LDADD) $(LIBS) -check_extension$(EXEEXT): $(check_extension_OBJECTS) $(check_extension_DEPENDENCIES) +check_extension$(EXEEXT): $(check_extension_OBJECTS) $(check_extension_DEPENDENCIES) $(EXTRA_check_extension_DEPENDENCIES) @rm -f check_extension$(EXEEXT) $(LINK) $(check_extension_OBJECTS) $(check_extension_LDADD) $(LIBS) -check_extra_relations_fncts$(EXEEXT): $(check_extra_relations_fncts_OBJECTS) $(check_extra_relations_fncts_DEPENDENCIES) +check_extra_relations_fncts$(EXEEXT): $(check_extra_relations_fncts_OBJECTS) $(check_extra_relations_fncts_DEPENDENCIES) $(EXTRA_check_extra_relations_fncts_DEPENDENCIES) @rm -f check_extra_relations_fncts$(EXEEXT) $(LINK) $(check_extra_relations_fncts_OBJECTS) $(check_extra_relations_fncts_LDADD) $(LIBS) -check_fdo1$(EXEEXT): $(check_fdo1_OBJECTS) $(check_fdo1_DEPENDENCIES) +check_fdo1$(EXEEXT): $(check_fdo1_OBJECTS) $(check_fdo1_DEPENDENCIES) $(EXTRA_check_fdo1_DEPENDENCIES) @rm -f check_fdo1$(EXEEXT) $(LINK) $(check_fdo1_OBJECTS) $(check_fdo1_LDADD) $(LIBS) -check_fdo2$(EXEEXT): $(check_fdo2_OBJECTS) $(check_fdo2_DEPENDENCIES) +check_fdo2$(EXEEXT): $(check_fdo2_OBJECTS) $(check_fdo2_DEPENDENCIES) $(EXTRA_check_fdo2_DEPENDENCIES) @rm -f check_fdo2$(EXEEXT) $(LINK) $(check_fdo2_OBJECTS) $(check_fdo2_LDADD) $(LIBS) -check_fdo3$(EXEEXT): $(check_fdo3_OBJECTS) $(check_fdo3_DEPENDENCIES) +check_fdo3$(EXEEXT): $(check_fdo3_OBJECTS) $(check_fdo3_DEPENDENCIES) $(EXTRA_check_fdo3_DEPENDENCIES) @rm -f check_fdo3$(EXEEXT) $(LINK) $(check_fdo3_OBJECTS) $(check_fdo3_LDADD) $(LIBS) -check_gaia_utf8$(EXEEXT): $(check_gaia_utf8_OBJECTS) $(check_gaia_utf8_DEPENDENCIES) +check_gaia_utf8$(EXEEXT): $(check_gaia_utf8_OBJECTS) $(check_gaia_utf8_DEPENDENCIES) $(EXTRA_check_gaia_utf8_DEPENDENCIES) @rm -f check_gaia_utf8$(EXEEXT) $(LINK) $(check_gaia_utf8_OBJECTS) $(check_gaia_utf8_LDADD) $(LIBS) -check_gaia_util$(EXEEXT): $(check_gaia_util_OBJECTS) $(check_gaia_util_DEPENDENCIES) +check_gaia_util$(EXEEXT): $(check_gaia_util_OBJECTS) $(check_gaia_util_DEPENDENCIES) $(EXTRA_check_gaia_util_DEPENDENCIES) @rm -f check_gaia_util$(EXEEXT) $(LINK) $(check_gaia_util_OBJECTS) $(check_gaia_util_LDADD) $(LIBS) -check_geom_aux$(EXEEXT): $(check_geom_aux_OBJECTS) $(check_geom_aux_DEPENDENCIES) +check_geom_aux$(EXEEXT): $(check_geom_aux_OBJECTS) $(check_geom_aux_DEPENDENCIES) $(EXTRA_check_geom_aux_DEPENDENCIES) @rm -f check_geom_aux$(EXEEXT) $(LINK) $(check_geom_aux_OBJECTS) $(check_geom_aux_LDADD) $(LIBS) -check_geometry_cols$(EXEEXT): $(check_geometry_cols_OBJECTS) $(check_geometry_cols_DEPENDENCIES) +check_geometry_cols$(EXEEXT): $(check_geometry_cols_OBJECTS) $(check_geometry_cols_DEPENDENCIES) $(EXTRA_check_geometry_cols_DEPENDENCIES) @rm -f check_geometry_cols$(EXEEXT) $(LINK) $(check_geometry_cols_OBJECTS) $(check_geometry_cols_LDADD) $(LIBS) -check_init$(EXEEXT): $(check_init_OBJECTS) $(check_init_DEPENDENCIES) +check_geoscvt_fncts$(EXEEXT): $(check_geoscvt_fncts_OBJECTS) $(check_geoscvt_fncts_DEPENDENCIES) $(EXTRA_check_geoscvt_fncts_DEPENDENCIES) + @rm -f check_geoscvt_fncts$(EXEEXT) + $(LINK) $(check_geoscvt_fncts_OBJECTS) $(check_geoscvt_fncts_LDADD) $(LIBS) +check_init$(EXEEXT): $(check_init_OBJECTS) $(check_init_DEPENDENCIES) $(EXTRA_check_init_DEPENDENCIES) @rm -f check_init$(EXEEXT) $(LINK) $(check_init_OBJECTS) $(check_init_LDADD) $(LIBS) -check_init2$(EXEEXT): $(check_init2_OBJECTS) $(check_init2_DEPENDENCIES) +check_init2$(EXEEXT): $(check_init2_OBJECTS) $(check_init2_DEPENDENCIES) $(EXTRA_check_init2_DEPENDENCIES) @rm -f check_init2$(EXEEXT) $(LINK) $(check_init2_OBJECTS) $(check_init2_LDADD) $(LIBS) -check_math_funcs$(EXEEXT): $(check_math_funcs_OBJECTS) $(check_math_funcs_DEPENDENCIES) +check_math_funcs$(EXEEXT): $(check_math_funcs_OBJECTS) $(check_math_funcs_DEPENDENCIES) $(EXTRA_check_math_funcs_DEPENDENCIES) @rm -f check_math_funcs$(EXEEXT) $(LINK) $(check_math_funcs_OBJECTS) $(check_math_funcs_LDADD) $(LIBS) -check_mbrcache$(EXEEXT): $(check_mbrcache_OBJECTS) $(check_mbrcache_DEPENDENCIES) +check_mbrcache$(EXEEXT): $(check_mbrcache_OBJECTS) $(check_mbrcache_DEPENDENCIES) $(EXTRA_check_mbrcache_DEPENDENCIES) @rm -f check_mbrcache$(EXEEXT) $(LINK) $(check_mbrcache_OBJECTS) $(check_mbrcache_LDADD) $(LIBS) -check_recover_geom$(EXEEXT): $(check_recover_geom_OBJECTS) $(check_recover_geom_DEPENDENCIES) +check_recover_geom$(EXEEXT): $(check_recover_geom_OBJECTS) $(check_recover_geom_DEPENDENCIES) $(EXTRA_check_recover_geom_DEPENDENCIES) @rm -f check_recover_geom$(EXEEXT) $(LINK) $(check_recover_geom_OBJECTS) $(check_recover_geom_LDADD) $(LIBS) -check_relations_fncts$(EXEEXT): $(check_relations_fncts_OBJECTS) $(check_relations_fncts_DEPENDENCIES) +check_relations_fncts$(EXEEXT): $(check_relations_fncts_OBJECTS) $(check_relations_fncts_DEPENDENCIES) $(EXTRA_check_relations_fncts_DEPENDENCIES) @rm -f check_relations_fncts$(EXEEXT) $(LINK) $(check_relations_fncts_OBJECTS) $(check_relations_fncts_LDADD) $(LIBS) -check_shp_load$(EXEEXT): $(check_shp_load_OBJECTS) $(check_shp_load_DEPENDENCIES) +check_shp_load$(EXEEXT): $(check_shp_load_OBJECTS) $(check_shp_load_DEPENDENCIES) $(EXTRA_check_shp_load_DEPENDENCIES) @rm -f check_shp_load$(EXEEXT) $(LINK) $(check_shp_load_OBJECTS) $(check_shp_load_LDADD) $(LIBS) -check_shp_load_3d$(EXEEXT): $(check_shp_load_3d_OBJECTS) $(check_shp_load_3d_DEPENDENCIES) +check_shp_load_3d$(EXEEXT): $(check_shp_load_3d_OBJECTS) $(check_shp_load_3d_DEPENDENCIES) $(EXTRA_check_shp_load_3d_DEPENDENCIES) @rm -f check_shp_load_3d$(EXEEXT) $(LINK) $(check_shp_load_3d_OBJECTS) $(check_shp_load_3d_LDADD) $(LIBS) -check_spatialindex$(EXEEXT): $(check_spatialindex_OBJECTS) $(check_spatialindex_DEPENDENCIES) +check_spatialindex$(EXEEXT): $(check_spatialindex_OBJECTS) $(check_spatialindex_DEPENDENCIES) $(EXTRA_check_spatialindex_DEPENDENCIES) @rm -f check_spatialindex$(EXEEXT) $(LINK) $(check_spatialindex_OBJECTS) $(check_spatialindex_LDADD) $(LIBS) -check_sql_stmt$(EXEEXT): $(check_sql_stmt_OBJECTS) $(check_sql_stmt_DEPENDENCIES) +check_sql_stmt$(EXEEXT): $(check_sql_stmt_OBJECTS) $(check_sql_stmt_DEPENDENCIES) $(EXTRA_check_sql_stmt_DEPENDENCIES) @rm -f check_sql_stmt$(EXEEXT) $(LINK) $(check_sql_stmt_OBJECTS) $(check_sql_stmt_LDADD) $(LIBS) -check_version$(EXEEXT): $(check_version_OBJECTS) $(check_version_DEPENDENCIES) +check_version$(EXEEXT): $(check_version_OBJECTS) $(check_version_DEPENDENCIES) $(EXTRA_check_version_DEPENDENCIES) @rm -f check_version$(EXEEXT) $(LINK) $(check_version_OBJECTS) $(check_version_LDADD) $(LIBS) -check_virtualtable1$(EXEEXT): $(check_virtualtable1_OBJECTS) $(check_virtualtable1_DEPENDENCIES) +check_virtualtable1$(EXEEXT): $(check_virtualtable1_OBJECTS) $(check_virtualtable1_DEPENDENCIES) $(EXTRA_check_virtualtable1_DEPENDENCIES) @rm -f check_virtualtable1$(EXEEXT) $(LINK) $(check_virtualtable1_OBJECTS) $(check_virtualtable1_LDADD) $(LIBS) -check_virtualtable2$(EXEEXT): $(check_virtualtable2_OBJECTS) $(check_virtualtable2_DEPENDENCIES) +check_virtualtable2$(EXEEXT): $(check_virtualtable2_OBJECTS) $(check_virtualtable2_DEPENDENCIES) $(EXTRA_check_virtualtable2_DEPENDENCIES) @rm -f check_virtualtable2$(EXEEXT) $(LINK) $(check_virtualtable2_OBJECTS) $(check_virtualtable2_LDADD) $(LIBS) -check_virtualtable3$(EXEEXT): $(check_virtualtable3_OBJECTS) $(check_virtualtable3_DEPENDENCIES) +check_virtualtable3$(EXEEXT): $(check_virtualtable3_OBJECTS) $(check_virtualtable3_DEPENDENCIES) $(EXTRA_check_virtualtable3_DEPENDENCIES) @rm -f check_virtualtable3$(EXEEXT) $(LINK) $(check_virtualtable3_OBJECTS) $(check_virtualtable3_LDADD) $(LIBS) -check_virtualtable4$(EXEEXT): $(check_virtualtable4_OBJECTS) $(check_virtualtable4_DEPENDENCIES) +check_virtualtable4$(EXEEXT): $(check_virtualtable4_OBJECTS) $(check_virtualtable4_DEPENDENCIES) $(EXTRA_check_virtualtable4_DEPENDENCIES) @rm -f check_virtualtable4$(EXEEXT) $(LINK) $(check_virtualtable4_OBJECTS) $(check_virtualtable4_LDADD) $(LIBS) -check_virtualtable5$(EXEEXT): $(check_virtualtable5_OBJECTS) $(check_virtualtable5_DEPENDENCIES) +check_virtualtable5$(EXEEXT): $(check_virtualtable5_OBJECTS) $(check_virtualtable5_DEPENDENCIES) $(EXTRA_check_virtualtable5_DEPENDENCIES) @rm -f check_virtualtable5$(EXEEXT) $(LINK) $(check_virtualtable5_OBJECTS) $(check_virtualtable5_LDADD) $(LIBS) -check_virtualtable6$(EXEEXT): $(check_virtualtable6_OBJECTS) $(check_virtualtable6_DEPENDENCIES) +check_virtualtable6$(EXEEXT): $(check_virtualtable6_OBJECTS) $(check_virtualtable6_DEPENDENCIES) $(EXTRA_check_virtualtable6_DEPENDENCIES) @rm -f check_virtualtable6$(EXEEXT) $(LINK) $(check_virtualtable6_OBJECTS) $(check_virtualtable6_LDADD) $(LIBS) -check_xls_load$(EXEEXT): $(check_xls_load_OBJECTS) $(check_xls_load_DEPENDENCIES) +check_xls_load$(EXEEXT): $(check_xls_load_OBJECTS) $(check_xls_load_DEPENDENCIES) $(EXTRA_check_xls_load_DEPENDENCIES) @rm -f check_xls_load$(EXEEXT) $(LINK) $(check_xls_load_OBJECTS) $(check_xls_load_LDADD) $(LIBS) -shape_3d$(EXEEXT): $(shape_3d_OBJECTS) $(shape_3d_DEPENDENCIES) +shape_3d$(EXEEXT): $(shape_3d_OBJECTS) $(shape_3d_DEPENDENCIES) $(EXTRA_shape_3d_DEPENDENCIES) @rm -f shape_3d$(EXEEXT) $(LINK) $(shape_3d_OBJECTS) $(shape_3d_LDADD) $(LIBS) -shape_cp1252$(EXEEXT): $(shape_cp1252_OBJECTS) $(shape_cp1252_DEPENDENCIES) +shape_cp1252$(EXEEXT): $(shape_cp1252_OBJECTS) $(shape_cp1252_DEPENDENCIES) $(EXTRA_shape_cp1252_DEPENDENCIES) @rm -f shape_cp1252$(EXEEXT) $(LINK) $(shape_cp1252_OBJECTS) $(shape_cp1252_LDADD) $(LIBS) -shape_primitives$(EXEEXT): $(shape_primitives_OBJECTS) $(shape_primitives_DEPENDENCIES) +shape_primitives$(EXEEXT): $(shape_primitives_OBJECTS) $(shape_primitives_DEPENDENCIES) $(EXTRA_shape_primitives_DEPENDENCIES) @rm -f shape_primitives$(EXEEXT) $(LINK) $(shape_primitives_OBJECTS) $(shape_primitives_LDADD) $(LIBS) -shape_utf8_1$(EXEEXT): $(shape_utf8_1_OBJECTS) $(shape_utf8_1_DEPENDENCIES) +shape_utf8_1$(EXEEXT): $(shape_utf8_1_OBJECTS) $(shape_utf8_1_DEPENDENCIES) $(EXTRA_shape_utf8_1_DEPENDENCIES) @rm -f shape_utf8_1$(EXEEXT) $(LINK) $(shape_utf8_1_OBJECTS) $(shape_utf8_1_LDADD) $(LIBS) -shape_utf8_2$(EXEEXT): $(shape_utf8_2_OBJECTS) $(shape_utf8_2_DEPENDENCIES) +shape_utf8_2$(EXEEXT): $(shape_utf8_2_OBJECTS) $(shape_utf8_2_DEPENDENCIES) $(EXTRA_shape_utf8_2_DEPENDENCIES) @rm -f shape_utf8_2$(EXEEXT) $(LINK) $(shape_utf8_2_OBJECTS) $(shape_utf8_2_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -2439,10 +2447,11 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_fdo3.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gaia_utf8.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_gaia_util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_geom_aux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_geometry_cols.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_geoscvt_fncts.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_init.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_init2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_math_funcs.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mbrcache.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_recover_geom.Po@am__quote@ @@ -2623,18 +2632,19 @@ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -2680,14 +2690,19 @@ install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: ADDED test/check_geoscvt_fncts.c Index: test/check_geoscvt_fncts.c ================================================================== --- test/check_geoscvt_fncts.c +++ test/check_geoscvt_fncts.c @@ -0,0 +1,102 @@ +/* + + check_geoscvt_fncts.c -- SpatiaLite Test Case + + This does "boundary conditions" and error checks for gg_geoscvt + functions that are hard to test with SQL. + + Author: Brad Hards + + ------------------------------------------------------------------------------ + + Version: MPL 1.1/GPL 2.0/LGPL 2.1 + + The contents of this file are subject to the Mozilla Public License Version + 1.1 (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + +Software distributed under the License is distributed on an "AS IS" basis, +WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +for the specific language governing rights and limitations under the +License. + +The Original Code is the SpatiaLite library + +The Initial Developer of the Original Code is Alessandro Furieri + +Portions created by the Initial Developer are Copyright (C) 2011 +the Initial Developer. All Rights Reserved. + +Contributor(s): +Brad Hards + +Alternatively, the contents of this file may be used under the terms of +either the GNU General Public License Version 2 or later (the "GPL"), or +the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +in which case the provisions of the GPL or the LGPL are applicable instead +of those above. If you wish to allow use of your version of this file only +under the terms of either the GPL or the LGPL, and not to allow others to +use your version of this file under the terms of the MPL, indicate your +decision by deleting the provisions above and replace them with the notice +and other provisions required by the GPL or the LGPL. If you do not delete +the provisions above, a recipient may use your version of this file under +the terms of any one of the MPL, the GPL or the LGPL. + +*/ +#include +#include +#include + +#include "sqlite3.h" +#include "spatialite.h" +#include "spatialite/gaiageo.h" + +// static const double double_eps = 0.00000001; + +int main (int argc, char *argv[]) +{ + gaiaGeomCollPtr result; + void *resultVoid; + // double resultDouble; + int returnValue = 0; + + /* Common setup */ + // spatialite_init(0); + + gaiaGeomCollPtr emptyGeometry = gaiaAllocGeomColl(); + // gaiaAddPointToGeomColl(validGeometry, 1.0, 2.0); + // double dummyResultArg = 0.0; + // double dummyResultArg2 = 0.0; + + /* Tests start here */ + + /* null input test */ + result = gaiaFromGeos_XY ( (const void*) NULL ); + if (result != NULL) { + fprintf(stderr, "bad result at %s:%i\n", __FILE__, __LINE__); + returnValue = -1; + goto exit; + } + + resultVoid = gaiaToGeos ((gaiaGeomCollPtr)NULL); + if (result != NULL) { + fprintf(stderr, "bad result at %s:%i\n", __FILE__, __LINE__); + returnValue = -2; + goto exit; + } + + /* unknown type geometry collection */ + result = gaiaToGeos ( emptyGeometry ); + if (result != NULL) { + fprintf(stderr, "bad result at %s:%i\n", __FILE__, __LINE__); + returnValue = -3; + goto exit; + } + + /* Cleanup and exit */ +exit: + gaiaFreeGeomColl (emptyGeometry); + // spatialite_cleanup(); + return returnValue; +} ADDED test/sql_stmt_tests/fromgml27.testcase Index: test/sql_stmt_tests/fromgml27.testcase ================================================================== --- test/sql_stmt_tests/fromgml27.testcase +++ test/sql_stmt_tests/fromgml27.testcase @@ -0,0 +1,7 @@ +FromGML - non-WGS84 Point +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('1,2')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('1,2')):0 +SRID=3003;POINT(1 2) ADDED test/sql_stmt_tests/fromgml28.testcase Index: test/sql_stmt_tests/fromgml28.testcase ================================================================== --- test/sql_stmt_tests/fromgml28.testcase +++ test/sql_stmt_tests/fromgml28.testcase @@ -0,0 +1,7 @@ +FromGML - MULTIPOINT, single point +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('1,2')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('1,2')):0 +SRID=-1;MULTIPOINT(1 2) ADDED test/sql_stmt_tests/fromgml29.testcase Index: test/sql_stmt_tests/fromgml29.testcase ================================================================== --- test/sql_stmt_tests/fromgml29.testcase +++ test/sql_stmt_tests/fromgml29.testcase @@ -0,0 +1,7 @@ +FromGML - GeometryCollection, single point +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('1,2')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('1,2')):0 +SRID=-1;GEOMETRYCOLLECTION(POINT(1 2)) ADDED test/sql_stmt_tests/fromgml30.testcase Index: test/sql_stmt_tests/fromgml30.testcase ================================================================== --- test/sql_stmt_tests/fromgml30.testcase +++ test/sql_stmt_tests/fromgml30.testcase @@ -0,0 +1,7 @@ +FromGML - MULTIPOINT, single pointZ +:memory: #use in-memory database +SELECT AsText(GeomFromGml('1,2,3.2')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('1,2,3.2')):0 +MULTIPOINT Z(1 2 3.2) ADDED test/sql_stmt_tests/fromgml31.testcase Index: test/sql_stmt_tests/fromgml31.testcase ================================================================== --- test/sql_stmt_tests/fromgml31.testcase +++ test/sql_stmt_tests/fromgml31.testcase @@ -0,0 +1,7 @@ +FromGML - GeometryCollection, single pointZ +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('1,2,3.2')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('1,2,3.2')):0 +SRID=-1;GEOMETRYCOLLECTION(POINT(1 2 3.2)) ADDED test/sql_stmt_tests/fromgml32.testcase Index: test/sql_stmt_tests/fromgml32.testcase ================================================================== --- test/sql_stmt_tests/fromgml32.testcase +++ test/sql_stmt_tests/fromgml32.testcase @@ -0,0 +1,7 @@ +FromGML - GeometryCollection, single pointZ, no namespace +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('1,2,3.2')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('1,2,3.2')):0 +SRID=-1;GEOMETRYCOLLECTION(POINT(1 2 3.2)) ADDED test/sql_stmt_tests/fromgml33.testcase Index: test/sql_stmt_tests/fromgml33.testcase ================================================================== --- test/sql_stmt_tests/fromgml33.testcase +++ test/sql_stmt_tests/fromgml33.testcase @@ -0,0 +1,7 @@ +FromGML - multipoint, single pointZ, SRID, no namespace +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('1,2,3.2')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('1,2,3.2')):0 +SRID=3213;MULTIPOINT(1 2 3.2) ADDED test/sql_stmt_tests/fromgml34.testcase Index: test/sql_stmt_tests/fromgml34.testcase ================================================================== --- test/sql_stmt_tests/fromgml34.testcase +++ test/sql_stmt_tests/fromgml34.testcase @@ -0,0 +1,7 @@ +FromGML - poslist linestring +:memory: #use in-memory database +SELECT AsText(GeomFromGml('45.67 88.56 55.56 89.44')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('45.67 88.56 55.56 89.44')):0 +LINESTRING(45.67 88.56, 55.56 89.44) ADDED test/sql_stmt_tests/fromgml35.testcase Index: test/sql_stmt_tests/fromgml35.testcase ================================================================== --- test/sql_stmt_tests/fromgml35.testcase +++ test/sql_stmt_tests/fromgml35.testcase @@ -0,0 +1,8 @@ +FromGML - poslist polygon +:memory: #use in-memory database +SELECT AsText(GeomFromGml('0 0 -100 0 -100 100 0 100 0 0')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('0 0 -100 0 -100 100 0 100 0 0')):0 +POLYGON((0 0, -100 0, -100 100, 0 100, 0 0)) + ADDED test/sql_stmt_tests/fromgml36.testcase Index: test/sql_stmt_tests/fromgml36.testcase ================================================================== --- test/sql_stmt_tests/fromgml36.testcase +++ test/sql_stmt_tests/fromgml36.testcase @@ -0,0 +1,8 @@ +FromGML - poslist polygon, no namespace +:memory: #use in-memory database +SELECT AsText(GeomFromGml('0 0 -100 0 -100 100 0 100 0 0')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('0 0 -100 0 -100 100 0 100 0 0')):0 +POLYGON((0 0, -100 0, -100 100, 0 100, 0 0)) + ADDED test/sql_stmt_tests/fromgml37.testcase Index: test/sql_stmt_tests/fromgml37.testcase ================================================================== --- test/sql_stmt_tests/fromgml37.testcase +++ test/sql_stmt_tests/fromgml37.testcase @@ -0,0 +1,8 @@ +FromGML - poslist polygon, bad contents +:memory: #use in-memory database +SELECT AsText(GeomFromGml('foo')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('foo')):0 +(NULL) + ADDED test/sql_stmt_tests/fromgml38.testcase Index: test/sql_stmt_tests/fromgml38.testcase ================================================================== --- test/sql_stmt_tests/fromgml38.testcase +++ test/sql_stmt_tests/fromgml38.testcase @@ -0,0 +1,8 @@ +FromGML - polygon, missing poslist +:memory: #use in-memory database +SELECT AsText(GeomFromGml('')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('')):0 +(NULL) + ADDED test/sql_stmt_tests/fromgml39.testcase Index: test/sql_stmt_tests/fromgml39.testcase ================================================================== --- test/sql_stmt_tests/fromgml39.testcase +++ test/sql_stmt_tests/fromgml39.testcase @@ -0,0 +1,7 @@ +FromGML - Polygon v2, inner ring poslist +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('0,0 5,0 5,5 0,5 0,01 1 2 1 2 2 1 2 1 1')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('0,0 5,0 5,5 0,5 0,01 1 2 1 2 2 1 2 1 1')):0 +SRID=4326;POLYGON((0 0,5 0,5 5,0 5,0 0),(1 1,2 1,2 2,1 2,1 1)) ADDED test/sql_stmt_tests/fromgml40.testcase Index: test/sql_stmt_tests/fromgml40.testcase ================================================================== --- test/sql_stmt_tests/fromgml40.testcase +++ test/sql_stmt_tests/fromgml40.testcase @@ -0,0 +1,7 @@ +FromGML - Polygon v2, poslist, broken +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('0,0 5,0 5,5 0,5 0,0foo')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('0,0 5,0 5,5 0,5 0,0foo')):0 +(NULL) ADDED test/sql_stmt_tests/fromgml41.testcase Index: test/sql_stmt_tests/fromgml41.testcase ================================================================== --- test/sql_stmt_tests/fromgml41.testcase +++ test/sql_stmt_tests/fromgml41.testcase @@ -0,0 +1,7 @@ +FromGML - Polygon v2, inner ring poslist, bad closing +:memory: #use in-memory database +SELECT AsEwkt(GeomFromGml('0,0 5,0 5,5 0,5 0,01 1 2 1 2 2 1 2 1 1')) +1 # rows (not including the header row) +1 # columns +AsEwkt(GeomFromGml('0,0 5,0 5,5 0,5 0,01 1 2 1 2 2 1 2 1 1')):0 +(NULL) ADDED test/sql_stmt_tests/fromgml42.testcase Index: test/sql_stmt_tests/fromgml42.testcase ================================================================== --- test/sql_stmt_tests/fromgml42.testcase +++ test/sql_stmt_tests/fromgml42.testcase @@ -0,0 +1,7 @@ +FromGML - multipointZ, multiple SRID, no namespace +:memory: #use in-memory database +SELECT AsText(GeomFromGml('1,2,3.22,4,3.2')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('1,2,3.22,4,3.2')):0 +MULTIPOINT Z(1 2 3.2, -4.356405 0.000738 79.631063) ADDED test/sql_stmt_tests/fromgml43.testcase Index: test/sql_stmt_tests/fromgml43.testcase ================================================================== --- test/sql_stmt_tests/fromgml43.testcase +++ test/sql_stmt_tests/fromgml43.testcase @@ -0,0 +1,7 @@ +FromGML - multipoint, multiple SRID - bad second SRID, no namespace +:memory: #use in-memory database +SELECT AsText(GeomFromGml('1,2,3.22,4,4.2')) +1 # rows (not including the header row) +1 # columns +AsText(GeomFromGml('1,2,3.22,4,4.2')):0 +MULTIPOINT Z(1 2 3.2, 2 4 4.2) ADDED test/sql_stmt_tests/issimple6.testcase Index: test/sql_stmt_tests/issimple6.testcase ================================================================== --- test/sql_stmt_tests/issimple6.testcase +++ test/sql_stmt_tests/issimple6.testcase @@ -0,0 +1,7 @@ +IsSimple - GeometryCollection, single point +:memory: #use in-memory database +SELECT IsSimple(GeomFromText("GEOMETRYCOLLECTION(POINT(1 2))")) +1 # rows (not including the header row) +1 # columns +IsSimple(GeomFromText("GEOMETRYCOLLECTION(POINT(1 2))")) +-1 ADDED test/sql_stmt_tests/isvalid14.testcase Index: test/sql_stmt_tests/isvalid14.testcase ================================================================== --- test/sql_stmt_tests/isvalid14.testcase +++ test/sql_stmt_tests/isvalid14.testcase @@ -0,0 +1,7 @@ +isvalid Geometry Collection of one polygon +:memory: #use in-memory database +SELECT IsValid(GeomFromText("GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)))")) +1 # rows (not including the header row) +1 # columns +IsValid(GeomFromText("GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)))")) +1 ADDED test/sql_stmt_tests/isvalid15.testcase Index: test/sql_stmt_tests/isvalid15.testcase ================================================================== --- test/sql_stmt_tests/isvalid15.testcase +++ test/sql_stmt_tests/isvalid15.testcase @@ -0,0 +1,7 @@ +isvalid Geometry Collection of two polygons +:memory: #use in-memory database +SELECT IsValid(GeomFromText("GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1 # rows (not including the header row) +1 # columns +IsValid(GeomFromText("GEOMETRYCOLLECTION(POLYGON((0 0, 10 0, 10 10, 0 10, 0 0)),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1 ADDED test/sql_stmt_tests/isvalid16.testcase Index: test/sql_stmt_tests/isvalid16.testcase ================================================================== --- test/sql_stmt_tests/isvalid16.testcase +++ test/sql_stmt_tests/isvalid16.testcase @@ -0,0 +1,7 @@ +isvalid Geometry Collection of point and polygon +:memory: #use in-memory database +SELECT IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1 # rows (not including the header row) +1 # columns +IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1 ADDED test/sql_stmt_tests/isvalid17.testcase Index: test/sql_stmt_tests/isvalid17.testcase ================================================================== --- test/sql_stmt_tests/isvalid17.testcase +++ test/sql_stmt_tests/isvalid17.testcase @@ -0,0 +1,7 @@ +isvalid Geometry Collection of point and linestring +:memory: #use in-memory database +SELECT IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1, 4 1, 4 4, 1 4, 1 1))")) +1 # rows (not including the header row) +1 # columns +IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(1 1, 4 1, 4 4, 1 4, 1 1))")) +1 ADDED test/sql_stmt_tests/isvalid18.testcase Index: test/sql_stmt_tests/isvalid18.testcase ================================================================== --- test/sql_stmt_tests/isvalid18.testcase +++ test/sql_stmt_tests/isvalid18.testcase @@ -0,0 +1,7 @@ +isvalid Geometry Collection of two points and linestring +:memory: #use in-memory database +SELECT IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),POINT(3 4),LINESTRING(1 1, 4 1, 4 4, 1 4, 1 1))")) +1 # rows (not including the header row) +1 # columns +IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),POINT(3 4),LINESTRING(1 1, 4 1, 4 4, 1 4, 1 1))")) +1 ADDED test/sql_stmt_tests/isvalid19.testcase Index: test/sql_stmt_tests/isvalid19.testcase ================================================================== --- test/sql_stmt_tests/isvalid19.testcase +++ test/sql_stmt_tests/isvalid19.testcase @@ -0,0 +1,7 @@ +isvalid Geometry Collection of two points and a polygon +:memory: #use in-memory database +SELECT IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),POINT(3 4),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1 # rows (not including the header row) +1 # columns +IsValid(GeomFromText("GEOMETRYCOLLECTION(POINT(0 0),POINT(3 4),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1 ADDED test/sql_stmt_tests/isvalid20.testcase Index: test/sql_stmt_tests/isvalid20.testcase ================================================================== --- test/sql_stmt_tests/isvalid20.testcase +++ test/sql_stmt_tests/isvalid20.testcase @@ -0,0 +1,7 @@ +isvalid Geometry Collection of two lines and a polygon +:memory: #use in-memory database +SELECT IsValid(GeomFromText("GEOMETRYCOLLECTION(LINESTRING(0 0, 4 1),LINESTRING(3 4, 4 6),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1 # rows (not including the header row) +1 # columns +IsValid(GeomFromText("GEOMETRYCOLLECTION(LINESTRING(0 0, 4 1),LINESTRING(3 4, 4 6),POLYGON((1 1, 4 1, 4 4, 1 4, 1 1)))")) +1