zorba-coders team mailing list archive

[Daniel Turcanu <danielturcanu@xxxxxxxxx>]

Daniel Turcanu has proposed merging lp:~danielturcanu/zorba/link1_fix into lp:zorba.

Requested reviews:
  Zorba Coders (zorba-coders)

For more details, see:
https://code.launchpad.net/~danielturcanu/zorba/link1_fix/+merge/86994

Removed test versioning/link1 to avoid bug 908062 on Windows
-- 
https://code.launchpad.net/~danielturcanu/zorba/link1_fix/+merge/86994
Your team Zorba Coders is requested to review the proposed merge of lp:~danielturcanu/zorba/link1_fix into lp:zorba.

=== 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-28 09:05:31 +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,11 @@
 ENDIF(XVERMAJ EQUAL 2)
 
 IF(WIN32)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external1 870991)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external2 870991)
+  #these 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)
+  #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