[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Chris Hillery has proposed merging
lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Juan Zacarias (juan457)
Related bugs:
Bug #874679 in Zorba: Clean up second arg to ADD_TEST_DIRECTORY()
https://bugs.launchpad.net/zorba/+bug/874679
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268
--
https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-04-16 20:56:43 +
+++ cmake_modules/ZorbaModule.cmake 2012-04-17 09:46:23 +
@@ -629,41 +629,101 @@
ENDMACRO(expected_failure)
-# Convenience macro for adding tests in a standard format.
+# Convenience macro for adding tests in a standard format. All test
+# cases (.xq files) in Queries subdirectory of the named directory
+# will be automatically added for CTest. Each test will be named
+# ${PROJECT_NAME}/filename, where filename is the path relative to
+# the Queries/ subdirectory.
+#
+# The optional second argument exists for Windows. Normally,
+# EXPECTED_FAILURE() can be used even for tests that crash
+# (segfault). However, on Windows, when a test crashes, it pops up a
+# dialog box. This prevents tests running unattended. Since it is not
+# possible with CMake to remove a test once added,
+# ADD_TEST_DIRECTORY() needs to be told not to add the test at all on
+# Windows platforms. Therefore, after the directory name, you may
+# additional arguments in the form (testname bugnumber testname
+# bugnumber ...) to ADD_TEST_DIRECTORY(). On Windows, the named tests
+# will be skipped entirely. On other platforms, they will be passed to
+# EXPECTED_FAILURE() with the corresponding bug number.
+#
+# This second argument should only be used for test cases that are
+# currently *crashing* on Windows. If the test is simply failing, then
+# you should use EXPECTED_FAILURE() after calling ADD_TEST_DIRECTORY().
+#
# 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.
+# (additional args) - expected crashing tests, as discussed above.
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)
+ # Convert extra arguments to two lists: test names and bug IDs
+ SET (crash_tests)
+ SET (crash_bugids)
+ SET (known_crashes ${ARGN})
+ LIST (LENGTH known_crashes num_crashes)
+ WHILE (num_crashes GREATER 0)
+LIST (GET known_crashes 0 _testcase)
+LIST (APPEND crash_tests ${_testcase})
+LIST (GET known_crashes 1 _bugid)
+LIST (APPEND crash_bugids ${_bugid})
+LIST (REMOVE_AT known_crashes 0 1)
+MATH (EXPR num_crashes ${num_crashes} - 2)
+ ENDWHILE (num_crashes GREATER 0)
+ IF(WIN32)
+SET(PATH_SEP ,)
+ ELSE(WIN32)
+SET(PATH_SEP :)
+ ENDIF(WIN32)
SET(TESTCOUNTER 0)
FOREACH(TESTFILE ${TESTFILES})
SET(TESTNAME ${PROJECT_NAME}/${TESTFILE})
-IF(WIN32)
- SET(PATH_SEP ,)
-ELSE(WIN32)
- SET(PATH_SEP :)
-ENDIF(WIN32)
-ADD_TEST(${TESTNAME} ${Zorba_TESTDRIVER}
- --rbkt-src ${TEST_DIR}
- --module-path ${CMAKE_BINARY_DIR}/URI_PATH/${PATH_SEP}${SECONDARY_MODULE_PATHS}
- ${TESTFILE})
-
-MATH(EXPR TESTCOUNTER ${TESTCOUNTER}+1)
-MATH(EXPR TESTMOD ${TESTCOUNTER}%100)
-IF (${TESTMOD} EQUAL 0)
- MESSAGE(STATUS Adding another 100 Tests)
-ENDIF (${TESTMOD} EQUAL 0)
+# See if this test is in the known-crashing list
+SET (_crash_bugid)
+LIST (FIND crash_tests ${TESTNAME} _crash_idx)
+IF (${_crash_idx} GREATER -1)
+ # Get corresponding bug ID
+ LIST (GET crash_bugids ${_crash_idx} _crash_bugid)
+ # Remove from known-crashing list
+ LIST (REMOVE_AT crash_tests ${_crash_idx})
+ENDIF (${_crash_idx} GREATER -1)
+
+# On Windows, skip calling ADD_TEST() for any known crashing tests
+IF (WIN32 AND (${_crash_idx} GREATER -1) )
+ MESSAGE (STATUS WARNING: Skipping test case ${TESTNAME} which is expected to crash - bug ${_crash_bugid})
+ELSE (WIN32 AND (${_crash_idx} GREATER -1) )
+ ADD_TEST(${TESTNAME} ${Zorba_TESTDRIVER}
+ --rbkt-src ${TEST_DIR}
+ --module-path
+ ${CMAKE_BINARY_DIR}/URI_PATH/${PATH_SEP}${SECONDARY_MODULE_PATHS}
+ ${TESTFILE})
+
+ # On non-Windows, call EXPECTED_FAILURE() for known crashes
+ IF (${_crash_idx} GREATER -1)
+ MESSAGE (STATUS Marking test case ${TESTNAME} as expected to crash - bug ${bugid})
+
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-874679-add-test-directory-2012-04-17T10-03-56.024Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Validation queue job bug-874679-add-test-directory-2012-04-17T10-03-56.024Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Review: Resubmit -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
srry I approved it thinking it was another branch, I am checking the changes and will approve as soon as I check all you mentioned in the email -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-874679-add-test-directory-2012-04-17T22-10-56.313Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
Validation queue job bug-874679-add-test-directory-2012-04-17T22-10-56.313Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-874679-add-test-directory into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 -- https://code.launchpad.net/~zorba-coders/zorba/bug-874679-add-test-directory/+merge/102268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
