Merge lp:~gabipetrovay/zorba/two-expected-failures into lp:zorba

[Gabriel Petrovay]

Marked two core tests failing on Windows as expected failures.

Two core tests are failing on Windows. I have created one bug for each:

https://bugs.launchpad.net/zorba/+bug/871061 - test/rbkt/zorba/versioning/link1
https://bugs.launchpad.net/zorba/+bug/871062 - test/rbkt/zorba/xqdoc/moduleDocumentation

[Gabriel Petrovay (gabipetrovay)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/two-expected-failures-2011-10-09T01-14-06.746Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job two-expected-failures-2011-10-09T01-14-06.746Z is finished. The final status was:

All tests succeeded!

=== modified file 'cmake_modules/Windows/FindCURL.cmake'
--- cmake_modules/Windows/FindCURL.cmake	2011-09-26 12:50:56 +0000
+++ cmake_modules/Windows/FindCURL.cmake	2011-10-09 01:13:29 +0000
@@ -31,13 +31,28 @@
 
 IF (CURL_FOUND)
 
-  # find the needed DLL's
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libeay32")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "openldap")
-  FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "ssleay32")
-
-  # find additional DLL's
-  FIND_DLL_WIN32 (libsasl.dll)
+  IF (EXISTS "${FOUND_LOCATION}/curl.exe")
+
+    MESSAGE (STATUS "Found CURL binary distribution")
+
+    # find the needed DLL's
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libeay32")
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "openldap")
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "ssleay32")
+
+  ELSE (EXISTS "${FOUND_LOCATION}/curl.exe")
+
+    MESSAGE (STATUS "Found CURL source build")
+
+    # find the needed DLL's
+    FIND_PACKAGE_DLL_WIN32 (${FOUND_LOCATION} "libcurl" "curllib")
+
+    # find additional DLL's
+    FIND_DLL_WIN32 ("libeay32.dll")
+    FIND_DLL_WIN32 ("ssleay32.dll")
+    #FIND_DLL_WIN32 (libsasl.dll)
+
+  ENDIF (EXISTS "${FOUND_LOCATION}/curl.exe")
 
 ENDIF (CURL_FOUND)

=== modified file 'cmake_modules/Windows/ProxyFindModule.cmake'
--- cmake_modules/Windows/ProxyFindModule.cmake	2011-10-05 20:22:04 +0000
+++ cmake_modules/Windows/ProxyFindModule.cmake	2011-10-09 01:13:29 +0000
@@ -243,7 +243,7 @@
       TMP_DLL_VAR
       "${NAME}.dll"
       PATHS "${LIBRARY_LOCATION}"
-      PATH_SUFFIXES "bin" "bin/Release" 
+      PATH_SUFFIXES "bin" "bin/Release" "lib"
       NO_DEFAULT_PATH
     )
 
@@ -308,7 +308,7 @@
       TMP_DLL_VAR
       "${NAME}"
       PATHS "${LIBRARY_LOCATION}"
-      PATH_SUFFIXES "bin" "bin/Release" 
+      PATH_SUFFIXES "bin" "bin/Release" "lib"
       NO_DEFAULT_PATH
     )
 

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-09-12 23:22:24 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2011-10-09 01:13:29 +0000
@@ -246,7 +246,12 @@
 ENDIF(XVERMAJ EQUAL 2)
 
 IF(WIN32)
-  EXPECTED_FAILURE(test/rbkt/zorba/eval/eval_schema2 3137594)
+  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/xqdoc/moduleDocumentation 871062)
+  
   EXPECTED_FAILURE(test/rbkt/zorba/file/createWriteReadDeleteSeries 3276394)
 ENDIF(WIN32)
 
@@ -268,5 +273,3 @@
 
 EXPECTED_FAILURE(test/rbkt/zorba/http-client/put/put3_binary_element 3391756)
 EXPECTED_FAILURE(test/rbkt/zorba/http-client/post/post3_binary_element 3391756)
-
-# vim:set et sw=2 ts=2: