[mapserver-commits] r12928 - in trunk/msautotest/wxs: . expected

svn at osgeo.org svn at osgeo.org
Wed Dec 28 11:38:02 EST 2011 

Author: schpidi
Date: 2011-12-28 08:38:01 -0800 (Wed, 28 Dec 2011)
New Revision: 12928

Modified:
   trunk/msautotest/wxs/expected/wms_empty_cap100.xml
   trunk/msautotest/wxs/expected/wms_empty_cap111.xml
   trunk/msautotest/wxs/expected/wms_empty_cap130.xml
   trunk/msautotest/wxs/expected/wms_empty_cap_latestversion.xml
   trunk/msautotest/wxs/wms_empty.map
Log:
Adjusting previous commit by adding [RESULT_DEVERSION].


Modified: trunk/msautotest/wxs/expected/wms_empty_cap100.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_empty_cap100.xml	2011-12-28 16:22:25 UTC (rev 12927)
+++ trunk/msautotest/wxs/expected/wms_empty_cap100.xml	2011-12-28 16:38:01 UTC (rev 12928)
@@ -6,8 +6,6 @@
 
 <WMT_MS_Capabilities version="1.0.0">
 
-<!-- MapServer version 6.1-dev-v1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=CAIRO SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
-
 <Service>
   <Name>GetMap</Name>
   <Title>Test simple wms</Title>

Modified: trunk/msautotest/wxs/expected/wms_empty_cap111.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_empty_cap111.xml	2011-12-28 16:22:25 UTC (rev 12927)
+++ trunk/msautotest/wxs/expected/wms_empty_cap111.xml	2011-12-28 16:38:01 UTC (rev 12928)
@@ -6,8 +6,6 @@
 
 <WMT_MS_Capabilities version="1.1.1">
 
-<!-- MapServer version 6.1-dev-v1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=CAIRO SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
-
 <Service>
   <Name>OGC:WMS</Name>
   <Title>Test simple wms</Title>

Modified: trunk/msautotest/wxs/expected/wms_empty_cap130.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_empty_cap130.xml	2011-12-28 16:22:25 UTC (rev 12927)
+++ trunk/msautotest/wxs/expected/wms_empty_cap130.xml	2011-12-28 16:38:01 UTC (rev 12928)
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
 <WMS_Capabilities version="1.3.0"  xmlns="http://www.opengis.net/wms"   xmlns:sld="http://www.opengis.net/sld"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd  http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd  http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wms_simple?service=WMS&amp;version=1.3.0&amp;request=GetSchemaExtension">
 
-<!-- MapServer version 6.1-dev-v1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=CAIRO SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
-
 <Service>
   <Name>WMS</Name>
   <Title>Test simple wms</Title>

Modified: trunk/msautotest/wxs/expected/wms_empty_cap_latestversion.xml
===================================================================
--- trunk/msautotest/wxs/expected/wms_empty_cap_latestversion.xml	2011-12-28 16:22:25 UTC (rev 12927)
+++ trunk/msautotest/wxs/expected/wms_empty_cap_latestversion.xml	2011-12-28 16:38:01 UTC (rev 12928)
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding="ISO-8859-1" standalone="no" ?>
 <WMS_Capabilities version="1.3.0"  xmlns="http://www.opengis.net/wms"   xmlns:sld="http://www.opengis.net/sld"   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"   xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd  http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd  http://mapserver.gis.umn.edu/mapserver http://localhost/path/to/wms_simple?service=WMS&amp;version=1.3.0&amp;request=GetSchemaExtension">
 
-<!-- MapServer version 6.1-dev-v1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=KML SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=CAIRO SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE -->
-
 <Service>
   <Name>WMS</Name>
   <Title>Test simple wms</Title>

Modified: trunk/msautotest/wxs/wms_empty.map
===================================================================
--- trunk/msautotest/wxs/wms_empty.map	2011-12-28 16:22:25 UTC (rev 12927)
+++ trunk/msautotest/wxs/wms_empty.map	2011-12-28 16:38:01 UTC (rev 12928)
@@ -5,10 +5,10 @@
 #
 # Capabilities (return no/empty layers element)
 #
-# RUN_PARMS: wms_empty_cap_latestversion.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&REQUEST=GetCapabilities" > [RESULT_DEMIME]
-# RUN_PARMS: wms_empty_cap130.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities" > [RESULT_DEMIME]
-# RUN_PARMS: wms_empty_cap111.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEMIME]
-# RUN_PARMS: wms_empty_cap100.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.0.0&REQUEST=GetCapabilities" > [RESULT_DEMIME]
+# RUN_PARMS: wms_empty_cap_latestversion.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&REQUEST=GetCapabilities" > [RESULT_DEMIME] [RESULT_DEVERSION]
+# RUN_PARMS: wms_empty_cap130.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.3.0&REQUEST=GetCapabilities" > [RESULT_DEMIME] [RESULT_DEVERSION]
+# RUN_PARMS: wms_empty_cap111.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetCapabilities" > [RESULT_DEMIME] [RESULT_DEVERSION]
+# RUN_PARMS: wms_empty_cap100.xml [MAPSERV] QUERY_STRING="map=[MAPFILE]&SERVICE=WMS&VERSION=1.0.0&REQUEST=GetCapabilities" > [RESULT_DEMIME] [RESULT_DEVERSION]
 #
 MAP
   WEB

More information about the mapserver-commits mailing list