[mapserver-commits] r11289 - in trunk/msautotest/misc: . expected

svn at osgeo.org svn at osgeo.org
Sun Mar 20 15:47:35 EDT 2011 

Author: warmerdam
Date: 2011-03-20 12:47:35 -0700 (Sun, 20 Mar 2011)
New Revision: 11289

Modified:
   trunk/msautotest/misc/expected/runtime_sub_test001.txt
   trunk/msautotest/misc/expected/runtime_sub_test002.gif
   trunk/msautotest/misc/expected/runtime_sub_test003.txt
   trunk/msautotest/misc/expected/runtime_sub_test004.gif
   trunk/msautotest/misc/expected/runtime_sub_test005.txt
   trunk/msautotest/misc/expected/runtime_sub_test006.gif
   trunk/msautotest/misc/expected/runtime_sub_test007.txt
   trunk/msautotest/misc/runtime_sub.map
Log:
strip error lines with full paths, accept very slightly different image results

Modified: trunk/msautotest/misc/expected/runtime_sub_test001.txt
===================================================================
--- trunk/msautotest/misc/expected/runtime_sub_test001.txt	2011-03-20 19:47:03 UTC (rev 11288)
+++ trunk/msautotest/misc/expected/runtime_sub_test001.txt	2011-03-20 19:47:35 UTC (rev 11289)
@@ -1,9 +1,9 @@
+Content-type: text/html
+
 <HTML>
-<HEAD><TITLE>MapServer Message</TITLE></HEAD>
-<!-- MapServer version 6.0.0-beta1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER INPUT=GDAL INPUT=SHAPEFILE -->
-<BODY BGCOLOR="#FFFFFF">
+<HEAD><TITLE>MapServer Message</TITLE></HEAD><BODY BGCOLOR="#FFFFFF">
 msDrawMap(): Image handling error. Failed to draw layer named &#39;layer1&#39;.
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/%name1%)
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/%name1%)
+[stripped line matching "ShapefileOpen"]
+[stripped line matching "ShapefileOpen"]
 msValidateParameter(): Regular expression error. Parameter pattern validation failed.
 </BODY></HTML>
\ No newline at end of file

Modified: trunk/msautotest/misc/expected/runtime_sub_test002.gif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/misc/expected/runtime_sub_test003.txt
===================================================================
--- trunk/msautotest/misc/expected/runtime_sub_test003.txt	2011-03-20 19:47:03 UTC (rev 11288)
+++ trunk/msautotest/misc/expected/runtime_sub_test003.txt	2011-03-20 19:47:35 UTC (rev 11289)
@@ -1,9 +1,9 @@
+Content-type: text/html
+
 <HTML>
-<HEAD><TITLE>MapServer Message</TITLE></HEAD>
-<!-- MapServer version 6.0.0-beta1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER INPUT=GDAL INPUT=SHAPEFILE -->
-<BODY BGCOLOR="#FFFFFF">
+<HEAD><TITLE>MapServer Message</TITLE></HEAD><BODY BGCOLOR="#FFFFFF">
 msDrawMap(): Image handling error. Failed to draw layer named &#39;layer2&#39;.
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/bad value)
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/bad value)
+[stripped line matching "ShapefileOpen"]
+[stripped line matching "ShapefileOpen"]
 msEvalRegex(): Regular expression error. String failed expression test.
 </BODY></HTML>
\ No newline at end of file

Modified: trunk/msautotest/misc/expected/runtime_sub_test004.gif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/misc/expected/runtime_sub_test005.txt
===================================================================
--- trunk/msautotest/misc/expected/runtime_sub_test005.txt	2011-03-20 19:47:03 UTC (rev 11288)
+++ trunk/msautotest/misc/expected/runtime_sub_test005.txt	2011-03-20 19:47:35 UTC (rev 11289)
@@ -1,10 +1,10 @@
+Content-type: text/html
+
 <HTML>
-<HEAD><TITLE>MapServer Message</TITLE></HEAD>
-<!-- MapServer version 6.0.0-beta1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER INPUT=GDAL INPUT=SHAPEFILE -->
-<BODY BGCOLOR="#FFFFFF">
+<HEAD><TITLE>MapServer Message</TITLE></HEAD><BODY BGCOLOR="#FFFFFF">
 msDrawMap(): Image handling error. Failed to draw layer named &#39;layer3&#39;.
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/%name3%)
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/%name3%)
+[stripped line matching "ShapefileOpen"]
+[stripped line matching "ShapefileOpen"]
 msValidateParameter(): Regular expression error. Parameter pattern validation failed.
 msEvalRegex(): Regular expression error. String failed expression test.
 </BODY></HTML>
\ No newline at end of file

Modified: trunk/msautotest/misc/expected/runtime_sub_test006.gif
===================================================================
(Binary files differ)

Modified: trunk/msautotest/misc/expected/runtime_sub_test007.txt
===================================================================
--- trunk/msautotest/misc/expected/runtime_sub_test007.txt	2011-03-20 19:47:03 UTC (rev 11288)
+++ trunk/msautotest/misc/expected/runtime_sub_test007.txt	2011-03-20 19:47:35 UTC (rev 11289)
@@ -1,10 +1,10 @@
+Content-type: text/html
+
 <HTML>
-<HEAD><TITLE>MapServer Message</TITLE></HEAD>
-<!-- MapServer version 6.0.0-beta1 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=WMS_SERVER INPUT=GDAL INPUT=SHAPEFILE -->
-<BODY BGCOLOR="#FFFFFF">
+<HEAD><TITLE>MapServer Message</TITLE></HEAD><BODY BGCOLOR="#FFFFFF">
 msDrawMap(): Image handling error. Failed to draw layer named &#39;layer4&#39;.
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/%name4%)
-msShapefileOpen(): Unable to access file. (/Users/sdlime/dev/msautotest/misc/./../query/data/%name4%)
+[stripped line matching "ShapefileOpen"]
+[stripped line matching "ShapefileOpen"]
 msValidateParameter(): Regular expression error. Parameter pattern validation failed.
 msEvalRegex(): Regular expression error. String failed expression test.
 </BODY></HTML>
\ No newline at end of file

Modified: trunk/msautotest/misc/runtime_sub.map
===================================================================
--- trunk/msautotest/misc/runtime_sub.map	2011-03-20 19:47:03 UTC (rev 11288)
+++ trunk/msautotest/misc/runtime_sub.map	2011-03-20 19:47:35 UTC (rev 11289)
@@ -1,14 +1,14 @@
 # Test Runtime Substitutions
 #
 # REQUIRES: INPUT=SHAPEFILE OUTPUT=GIF
-#
-# RUN_PARMS: runtime_sub_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer1&name1=bdry_counpy2' > [RESULT_DEMIME]
+# 
+# RUN_PARMS: runtime_sub_test001.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer1&name1=bdry_counpy2' > [RESULT_DEVERSION] [STRIP:ShapefileOpen]
 # RUN_PARMS: runtime_sub_test002.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer2&name2=bdry_counpy2' > [RESULT_DEMIME]
-# RUN_PARMS: runtime_sub_test003.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer2&name2=bad+value' > [RESULT_DEMIME]
+# RUN_PARMS: runtime_sub_test003.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer2&name2=bad+value' > [RESULT_DEVERSION] [STRIP:ShapefileOpen]
 # RUN_PARMS: runtime_sub_test004.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer3&name3=bdry_counpy2' > [RESULT_DEMIME]
-# RUN_PARMS: runtime_sub_test005.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer3&name3=bad+value' > [RESULT_DEMIME]
+# RUN_PARMS: runtime_sub_test005.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer3&name3=bad+value' > [RESULT_DEVERSION] [STRIP:ShapefileOpen]
 # RUN_PARMS: runtime_sub_test006.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer4&name4=bdry_counpy2' > [RESULT_DEMIME]
-# RUN_PARMS: runtime_sub_test007.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer4&name4=bad+value' > [RESULT_DEMIME]
+# RUN_PARMS: runtime_sub_test007.txt [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer4&name4=bad+value' > [RESULT_DEVERSION] [STRIP:ShapefileOpen]
 # RUN_PARMS: runtime_sub_test008.gif [MAPSERV] QUERY_STRING='map=[MAPFILE]&mode=map&layer=layer5' > [RESULT_DEMIME]
 #
 MAP
@@ -16,6 +16,7 @@
   EXTENT 125000 4785000 789000 5489000
   UNITS METERS
   SIZE 500 500
+  SHAPEPATH "."
 
   IMAGETYPE GIF

More information about the mapserver-commits mailing list