zorba-coders team mailing list archive

[Daniel Turcanu <danielturcanu@xxxxxxxxx>]

Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/plan-serializer into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807

Fixed memory leak in serialization of Diagnostic class.
-- 
https://code.launchpad.net/~danielturcanu/zorba/plan-serializer/+merge/86807
Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/plan-serializer into lp:zorba.

=== modified file 'src/zorbaserialization/zorba_class_serializer.cpp'
--- src/zorbaserialization/zorba_class_serializer.cpp	2011-09-30 14:06:33 +0000
+++ src/zorbaserialization/zorba_class_serializer.cpp	2011-12-23 14:18:26 +0000
@@ -1080,6 +1080,7 @@
         ar & local;
         ar.set_is_temp_field(false);
         obj = internal::SystemDiagnosticBase::find(local);
+        free(local);
         ZORBA_ASSERT(obj);
       }
       else

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-12-22 20:34:53 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2011-12-23 14:18:26 +0000
@@ -168,6 +168,11 @@
       SET (SKIP_TEST 1)
     ENDIF (NEEDS_FULL_TEXT)
   ENDIF (ZORBA_NO_FULL_TEXT)
+  IF(WIN32)
+    IF(${TESTNAME} MATCHES "test/rbkt/zorba/versioning/link1")
+      SET(SKIP_TEST 1)
+    ENDIF(${TESTNAME} MATCHES "test/rbkt/zorba/versioning/link1")
+  ENDIF(WIN32)
 
   # If WordNet thesaurus not found, skip ft-thesaurus-true tests
   IF (NOT ZORBA_WORDNET_FOUND)
@@ -260,10 +265,12 @@
 ENDIF(XVERMAJ EQUAL 2)
 
 IF(WIN32)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external1 870991)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external2 870991)
+  #there tests now work on Windows
+  #EXPECTED_FAILURE(test/rbkt/zorba/versioning/external1 870991)
+  #EXPECTED_FAILURE(test/rbkt/zorba/versioning/external2 870991)
 
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/link1 871061)
+  #disabled this test on WIN32
+  #EXPECTED_FAILURE(test/rbkt/zorba/versioning/link1 871061)
 
   # this is still an expected failure but has been commented out since the
   # test is now completely disabled because of bug 871335

=== modified file 'test/rbkt/modules/CMakeLists.txt'
--- test/rbkt/modules/CMakeLists.txt	2011-08-26 22:46:24 +0000
+++ test/rbkt/modules/CMakeLists.txt	2011-12-23 14:18:26 +0000
@@ -32,6 +32,7 @@
 DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/ext";
   VERSION 1.0 FILE "ext.xq" TEST_ONLY)
 
+IF(NOT WIN32) #disable link + ourlib on Windows
 ADD_SUBDIRECTORY(ourlib)
 
 # For the moment, this test module depends on Xerces
@@ -39,6 +40,7 @@
   DECLARE_ZORBA_MODULE(URI "http://www.zorba-xquery.com/modules/link";
     VERSION 1.0 LINK_LIBRARIES "ourlib" FILE "link.xq" TEST_ONLY)
 ENDIF (NOT ZORBA_NO_XMLSCHEMA)
+ENDIF(NOT WIN32)
 
 DECLARE_ZORBA_SCHEMA(URI "http://www.zorba-xquery.com/modules/theschema";
   FILE "schema.xsd" TEST_ONLY)