Merge lp:~danielturcanu/zorba/link1_fix into lp:zorba

[Daniel Turcanu]

Removed test versioning/link1 to avoid bug 908062 on Windows

Removed test versioning/link1 to avoid bug 908062 on Windows

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Chris Hillery (ceejatec)]

- Please put a very prominent comment around the SKIP_TEST block identifying why the test is skipped and listing the bug number.

- Likewise, please add comment referring to the bug number next to the commented-out EXPECTED_FAILURE() for the link1 test.

- If the external1/external2 tests are working now, you should just remove the EXPECTED_FAILURE() lines rather than commenting them out.

FYI, for relatively trivial changes like this, I would have just made the corrections myself, but since the branch is owned by ~danielturcanu I couldn't do that...

review: Needs Fixing

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/link1_fix-2011-12-29T08-41-04.925Z/log.html

[Chris Hillery (ceejatec)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue job link1_fix-2011-12-29T08-41-04.925Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve.

[Daniel Turcanu (danielturcanu)]

+one

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/link1_fix-2012-01-11T01-47-04.43Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job link1_fix-2012-01-11T01-47-04.43Z is finished. The final status was:

All tests succeeded!

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-12-29 08:31:53 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2011-12-29 08:40:46 +0000
@@ -168,6 +168,13 @@
       SET (SKIP_TEST 1)
     ENDIF (NEEDS_FULL_TEXT)
   ENDIF (ZORBA_NO_FULL_TEXT)
+  IF(WIN32)
+    #this test fails on Windows because cannot find ourlib.dll
+    #bug 908062
+    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,15 +267,6 @@
 ENDIF(XVERMAJ EQUAL 2)
 
 IF(WIN32)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external1 870991)
-  EXPECTED_FAILURE(test/rbkt/zorba/versioning/external2 870991)
-
-  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
-  #EXPECTED_FAILURE(test/rbkt/zorba/xqdoc/moduleDocumentation 871062)
-
   EXPECTED_FAILURE(test/rbkt/zorba/file/createWriteReadDeleteSeries 866969)
 ENDIF(WIN32)