[geos-commits] r3102 - in trunk: include/geos/geom tests/xmltester

[svn_geos at osgeo.org]

Author: strk
Date: 2010-08-27 15:55:28 +0000 (Fri, 27 Aug 2010)
New Revision: 3102

Modified:
   trunk/include/geos/geom/BinaryOp.h
   trunk/tests/xmltester/Makefile.am
Log:
Check validity of CommonBitsOp return, as JTS does. Check output validity for all tests, do not run the now-throwing tests also known to be bogus in JTS.


Modified: trunk/include/geos/geom/BinaryOp.h
===================================================================
--- trunk/include/geos/geom/BinaryOp.h	2010-08-27 15:43:21 UTC (rev 3101)
+++ trunk/include/geos/geom/BinaryOp.h	2010-08-27 15:55:28 UTC (rev 3102)
@@ -117,7 +117,7 @@
  * to prevent a result.
  *
  */
-//#define GEOS_CHECK_COMMONBITS_VALIDITY 1
+#define GEOS_CHECK_COMMONBITS_VALIDITY 1
 
 /*
  * Use snapping policy

Modified: trunk/tests/xmltester/Makefile.am
===================================================================
--- trunk/tests/xmltester/Makefile.am	2010-08-27 15:43:21 UTC (rev 3101)
+++ trunk/tests/xmltester/Makefile.am	2010-08-27 15:55:28 UTC (rev 3102)
@@ -6,9 +6,9 @@
 #top_srcdir=@top_srcdir@
 #top_builddir=@top_builddir@
 
-TESTS = testrunner invalid-testrunner
+TESTS = testrunner
 
-CLEANFILES = testrunner invalid-testrunner
+CLEANFILES = testrunner 
 
 EXTRA_DIST = testrunner.sh
 
@@ -57,6 +57,7 @@
 	$(srcdir)/tests/general/TestValid2-big.xml \
 	$(srcdir)/tests/general/TestWithinDistance.xml \
 	$(srcdir)/tests/stmlf/stmlf-cases-20061020.xml \
+	$(srcdir)/tests/stmlf/stmlf-cases-20061020-invalid-output.xml \
 	$(srcdir)/tests/stmlf/stmlf-cases-20070119.xml \
 	$(srcdir)/tests/robust/TestRobustOverlayFixed.xml \
 	$(srcdir)/tests/robust/TestRobustRelate.xml \
@@ -70,8 +71,7 @@
 	$(srcdir)/tests/safe/16595.xml \
 	$(srcdir)/tests/safe/16596.xml
 
-INVALID_OUTPUT_XMLTESTS = \
-	$(srcdir)/tests/stmlf/stmlf-cases-20061020-invalid-output.xml
+INVALID_OUTPUT_XMLTESTS = 
 
 FAILING_XMLTESTS = \
 	$(srcdir)/tests/failure/TestOverlay.xml
@@ -121,6 +121,3 @@
 testrunner: testrunner.sh Makefile
 	@sh $(srcdir)/testrunner.sh $@ --test-valid-output $(SAFE_XMLTESTS)
 
-invalid-testrunner: testrunner.sh Makefile
-	@sh $(srcdir)/testrunner.sh $@ $(INVALID_OUTPUT_XMLTESTS)
-