Added SFCGAL version output

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

diff --git a/regress/run_test b/regress/run_test
index 2b1c9a5a4bf39fd7a001e7ead3bd105d24e5e427..b85f9c8943779bba9ac26ca370f735a3ae5c6221 100755 (executable)
--- a/regress/run_test
+++ b/regress/run_test
@@ -948,6 +948,9 @@ fi
 
 geosver=`${PSQL} -tAc "select postgis_geos_version()" "${DB}"`
 projver=`${PSQL} -tAc "select postgis_proj_version()" "${DB}"`
+if test x"$OPT_WITH_SFCGAL" = "xyes"; then
+  sfcgalver=`${PSQL} -tAc "select postgis_sfcgal_version()" "${DB}"`
+fi
 if test x"$OPT_WITH_RASTER" = "xyes"; then
   gdalver=`${PSQL} -tAc "select postgis_gdal_version()" "${DB}"`
 fi
@@ -967,6 +970,9 @@ fi
 if [ -n "$projver" ]; then
        echo "   PROJ: $projver"
 fi
+if [ -n "$sfcgalver" ]; then
+       echo "   SFCGAL: $sfcgalver"
+fi
 if [ -n "$gdalver" ]; then
        echo "   GDAL: $gdalver"
 fi

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 7ea6ef69f1ee3251e96aeb65a33902dd69960dbb..dfcfbaec71c4a5055a75fec46c732c4abfdbf400 100755 (executable)
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -226,11 +226,13 @@ my $svnrev = sql("select postgis_svn_version()");
 my $libbuilddate = sql("select postgis_lib_build_date()");
 my $pgsqlver = sql("select version()");
 my $gdalver = sql("select postgis_gdal_version()") if $OPT_WITH_RASTER;
+my $sfcgalver = sql("select postgis_sfcgal_version()") if $OPT_WITH_SFCGAL;
 
 print "$pgsqlver\n";
 print "  Postgis $libver - r${svnrev} - $libbuilddate\n";
 print "  GEOS: $geosver\n" if $geosver;
 print "  PROJ: $projver\n" if $projver;
+print "  SFCGAL: $sfcgalver\n" if $sfcgalver;
 print "  GDAL: $gdalver\n" if $gdalver;
 
 
@@ -1037,21 +1039,21 @@ sub prepare_spatial
        
        if ( $OPT_WITH_TOPO )
        {
-               print "Loading Topology";
+               print "Loading Topology\n";
                load_sql_file("${STAGED_SCRIPTS_DIR}/topology.sql", 1);
                load_sql_file("${STAGED_SCRIPTS_DIR}/topology_comments.sql", 0);
        }
        
        if ( $OPT_WITH_RASTER )
        {
-               print "Loading Raster";
+               print "Loading Raster\n";
                load_sql_file("${STAGED_SCRIPTS_DIR}/rtpostgis.sql", 1);
                load_sql_file("${STAGED_SCRIPTS_DIR}/raster_comments.sql", 0);
        }
 
        if ( $OPT_WITH_SFCGAL )
        {
-               print "Loading sfcgal";
+               print "Loading sfcgal\n";
                load_sql_file("${STAGED_SCRIPTS_DIR}/sfcgal.sql", 1);
                load_sql_file("${STAGED_SCRIPTS_DIR}/sfcgal_comments.sql", 0);
        }