Merge lp:~gabipetrovay/zorba/add-test-directory-exceptions into lp:zorba

[Gabriel Petrovay]

Interpreting the second parameter of ADD_TEST_DIRECTORY as an exception list. Those tests will be removed from the tests to be executed.

Interpreting the second parameter of ADD_TEST_DIRECTORY as an exception list. Those tests will be removed from the tests to be executed.

This allows for disabling some tests in exceptional cases (like segmentation faults on Windows)

[Gabriel Petrovay (gabipetrovay)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/add-test-directory-exceptions-2011-10-09T01-43-06.193Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job add-test-directory-exceptions-2011-10-09T01-43-06.193Z 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:19:25 +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:19:25 +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 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2011-10-06 11:11:13 +0000
+++ cmake_modules/ZorbaModule.cmake	2011-10-09 01:19:25 +0000
@@ -553,11 +553,21 @@
 
 ENDMACRO(expected_failure)
 
-# Convenience macro for adding tests in a standard format. QQQ doc!
-MACRO(ADD_TEST_DIRECTORY TEST_DIR)
+# Convenience macro for adding tests in a standard format.
+# Parameters:
+#   TEST_DIR - all the .xq files in this directory will be added as tests
+#   ARGV1    - if this is present, it will be interpreted as a list of
+#              exceptions. The list items will be removed from the list of
+#              files found in TEST_DIR.
+MACRO (ADD_TEST_DIRECTORY TEST_DIR)
   # QQQ error-check: Queries directory exists, some tests found...
   FILE(GLOB_RECURSE TESTFILES FOLLOW_SYMLINKS
     RELATIVE "${TEST_DIR}/Queries" "${TEST_DIR}/Queries/*.xq")
+
+  FOREACH (EXCEPTION ${ARGV1})
+    LIST (REMOVE_ITEM TESTFILES ${EXCEPTION})
+  ENDFOREACH (EXCEPTION)
+
   SET(TESTCOUNTER 0)
   FOREACH(TESTFILE ${TESTFILES})
     SET(TESTNAME "${PROJECT_NAME}/${TESTFILE}")
@@ -579,7 +589,7 @@
     ENDIF (${TESTMOD} EQUAL 0)
   ENDFOREACH(TESTFILE)
   MESSAGE(STATUS "Added ${TESTCOUNTER} tests in ${TEST_DIR}")
-ENDMACRO(ADD_TEST_DIRECTORY)
+ENDMACRO (ADD_TEST_DIRECTORY)
 
 # Macro to install a basic CMake config file for a module. Provide a
 # source and binary directory. Result will be installed in binary

=== 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:19:25 +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: