[geos-commits] r2674 - in trunk: build/msvc90/geos_unit
build/msvc90/geos_xmltester tests/xmltester
svn_geos at osgeo.org
svn_geos at osgeo.org
Wed Oct 14 11:32:07 EDT 2009
Author: mloskot
Date: 2009-10-14 11:32:06 -0400 (Wed, 14 Oct 2009)
New Revision: 2674
Added:
trunk/tests/xmltester/makefile.vc
Modified:
trunk/build/msvc90/geos_unit/geos_unit.vcproj
trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj
trunk/tests/xmltester/XMLTester.cpp
Log:
* Optional use of GEOS_DEBUG_MSVC_USE_VLD in XMLTester.cpp
* Added xmltester/makefile.vc as port of testrunner.sh for Windows to be able to run all tests in batch:
** nmake /f makefile.vc XMLTESTER=C:\path\to\xmltester.exe
Modified: trunk/build/msvc90/geos_unit/geos_unit.vcproj
===================================================================
--- trunk/build/msvc90/geos_unit/geos_unit.vcproj 2009-10-14 12:05:26 UTC (rev 2673)
+++ trunk/build/msvc90/geos_unit/geos_unit.vcproj 2009-10-14 15:32:06 UTC (rev 2674)
@@ -91,8 +91,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
- Description="Running regression tests using $(ProjectName)d.exe..."
- CommandLine="cd $(OutDir)
$(ProjectName)d.exe
"
+ Description="Running regression tests using $(TargetPath)"
+ CommandLine="$(TargetPath)"
/>
</Configuration>
<Configuration
@@ -168,8 +168,8 @@
/>
<Tool
Name="VCPostBuildEventTool"
- Description="Running regression tests using $(ProjectName).exe..."
- CommandLine="$(OutDir)\$(ProjectName).exe"
+ Description="Running regression tests using $(TargetPath)"
+ CommandLine="$(TargetPath)"
/>
</Configuration>
</Configurations>
Modified: trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj
===================================================================
--- trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj 2009-10-14 12:05:26 UTC (rev 2673)
+++ trunk/build/msvc90/geos_xmltester/geos_xmltester.vcproj 2009-10-14 15:32:06 UTC (rev 2674)
@@ -204,6 +204,266 @@
>
</File>
</Filter>
+ <Filter
+ Name="tests"
+ >
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\badguy3.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\buffer.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\buffer_snapround.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\bug176.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\bug188.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\bug244.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\bug275.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\fme.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\heisenbugs.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\hexwkb.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\hole_from_shell.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\hole_red.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\linemerge.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\robustness.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\singlesidedbuffer.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\split.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\test.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\TestBigNastyBuffer.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\TestBufferExternal.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\TestBufferExternal2.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\TestIsValid.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\testLeaksBig.xml"
+ >
+ </File>
+ <Filter
+ Name="general"
+ >
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\MISSING"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestBoundary.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestBuffer.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestBufferMitredJoin.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestCentroid.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestConvexHull-big.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestConvexHull.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionAA.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionAAPrec.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionLA.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionLAPrec.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionLL.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionLLPrec.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionPA.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionPL.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionPLPrec.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestFunctionPP.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestInteriorPoint.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRectanglePredicate.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelateAA.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelateAC.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelateLA.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelateLC.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelateLL.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelatePA.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelatePL.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestRelatePP.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestSimple.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestValid.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestValid2-big.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestValid2.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\general\TestWithinDistance.xml"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="robust"
+ >
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\stmlf\stmlf-cases-20061020.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\stmlf\stmlf-cases-20070119.xml"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="safe"
+ >
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\safe\16595.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\safe\16596.xml"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="stmlf"
+ >
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\robust\TestRobustOverlayFixed.xml"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\tests\xmltester\tests\robust\TestRobustRelate.xml"
+ >
+ </File>
+ </Filter>
+ </Filter>
<File
RelativePath="..\..\..\tests\xmltester\BufferResultMatcher.cpp"
>
@@ -217,6 +477,10 @@
>
</File>
<File
+ RelativePath="..\..\..\tests\xmltester\makefile.vc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\tests\xmltester\safe_to_xml.sh"
>
</File>
@@ -229,6 +493,10 @@
>
</File>
<File
+ RelativePath="..\..\..\tests\xmltester\testrunner.bat"
+ >
+ </File>
+ <File
RelativePath="..\..\..\tests\xmltester\XMLTester.cpp"
>
</File>
Modified: trunk/tests/xmltester/XMLTester.cpp
===================================================================
--- trunk/tests/xmltester/XMLTester.cpp 2009-10-14 12:05:26 UTC (rev 2673)
+++ trunk/tests/xmltester/XMLTester.cpp 2009-10-14 15:32:06 UTC (rev 2674)
@@ -14,10 +14,14 @@
*
**********************************************************************/
+#ifdef _MSC_VER
+# if defined(GEOS_DEBUG_MSVC_USE_VLD) && !defined(GEOS_TEST_USE_STACKWALKER)
+# include <vld.h>
+# else
//#define _CRTDBG_MAP_ALLOC
//#include <stdlib.h>
-#ifdef _MSC_VER
-#include <crtdbg.h>
+# include <crtdbg.h>
+# endif
#endif
#include <geos/geom/Point.h>
Added: trunk/tests/xmltester/makefile.vc
===================================================================
--- trunk/tests/xmltester/makefile.vc (rev 0)
+++ trunk/tests/xmltester/makefile.vc 2009-10-14 15:32:06 UTC (rev 2674)
@@ -0,0 +1,77 @@
+GEOS_ROOT=../..
+
+!IFNDEF XMLTESTER
+XMLTESTER=xmltester.exe
+!ENDIF
+
+SAFE_XMLTESTS= \
+ $(GEOS_ROOT)/tests/xmltester/tests/testLeaksBig.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/split.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/hexwkb.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/test.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/linemerge.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/TestIsValid.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/robustness.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/singlesidedbuffer.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/bug176.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/bug188.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/bug244.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/bug275.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestBoundary.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestBuffer.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestBufferMitredJoin.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestCentroid.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestConvexHull.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestConvexHull-big.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionAAPrec.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionAA.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLAPrec.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLA.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLLPrec.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionLL.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPA.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPLPrec.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPL.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestFunctionPP.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestInteriorPoint.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRectanglePredicate.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateAA.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateLA.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateLL.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelatePL.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateAC.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelateLC.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelatePA.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestRelatePP.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestSimple.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestValid.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestValid2.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestValid2-big.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/general/TestWithinDistance.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/stmlf/stmlf-cases-20061020.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/stmlf/stmlf-cases-20070119.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/robust/TestRobustOverlayFixed.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/robust/TestRobustRelate.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/fme.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/TestBufferExternal.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/TestBufferExternal2.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/heisenbugs.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/badguy3.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/hole_from_shell.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/hole_red.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/safe/16595.xml \
+ $(GEOS_ROOT)/tests/xmltester/tests/safe/16596.xml
+
+all:
+ @echo Usage:
+ @echo 1) Run XMLTester.exe program from current directory:
+ @echo " nmake /f makefile.vc"
+ @echo 2) Run XMLTester.exe program from specified location:
+ @echo " nmake /f makefile.vc XMLTESTER=C:\path\to\XMLTester.exe"
+ @echo
+
+test:
+ @echo ====== Running GEOX XMLTester test cases ======
+ @echo ====== XMLTester program: $(XMLTESTER)
+ @for %t in ( $(SAFE_XMLTESTS) ) do \
+ $(XMLTESTER) %t
More information about the geos-commits
mailing list