Update of /cvsroot/monetdb/pathfinder/conf/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv5814/conf/Tests

Modified Files:
      Tag: M5XQ
        monetdb-xquery-conds.stable.out.Darwin9.6.0.64bit 
Log Message:
propagated changes of Wednesday May 20 2009
from the development trunk to the M5XQ branch

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/20 - sjoerd:
        conf/Tests/monetdb-xquery-conds.stable.out.Darwin9.6.0.64bit,1.5
propagated changes of Wednesday May 20 2009
from the May2009 branch to the development trunk

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/05/20 - stmane:
        conf/Tests/monetdb-xquery-conds.stable.out.Darwin9.6.0.64bit,1.4.2.1

Using condifitonal HAVE_LIBXML2 to disable SQL tests that require XML support 
in MonetDB5
(cf., sql/src/test/sql_xml/Tests/) did/does not work,
since SQL does not (need to) check for libxml2, and hence does not define 
conditional HAVE_LIBXML2.

Hence, we use the same solution as for RDF support in MonetDB5:
In case MonetDB5 has been compiled with libxml2 available,
and hence provides XML support (module xml),
we define conditional and macro HAVE_MONETDB5_XML,
and then use that conditional in sql/src/test/sql_xml/Tests/All .

On Windows, for convenience, we also define HAVE_MONETDB5_XML
(and HAVE_MONETDB5_RDF) in case both HAVE_MONETDB5 and HAVE_LIBXML2
(or HAVE_RAPTOR) are defined.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: monetdb-xquery-conds.stable.out.Darwin9.6.0.64bit
===================================================================
RCS file: 
/cvsroot/monetdb/pathfinder/conf/Tests/monetdb-xquery-conds.stable.out.Darwin9.6.0.64bit,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- monetdb-xquery-conds.stable.out.Darwin9.6.0.64bit   13 May 2009 11:14:00 
-0000      1.2.2.2
+++ monetdb-xquery-conds.stable.out.Darwin9.6.0.64bit   20 May 2009 16:29:35 
-0000      1.2.2.3
@@ -19,6 +19,7 @@
 HAVE_MONETDB4=#
 HAVE_MONETDB5=#
 HAVE_MONETDB5_RDF=
+HAVE_MONETDB5_XML=
 HAVE_MONETDB=#
 HAVE_PCRE=
 HAVE_PERL_DEVEL=#


------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables 
unlimited royalty-free distribution of the report engine 
for externally facing server and web deployment. 
http://p.sf.net/sfu/businessobjects
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to