[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ctest-j8 into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/ctest-j8 into
lp:zorba.
Commit message:
Test fixes to ensure all tests can be run in parallel. In particular: create
all .res file output directories at CMake time, not in the testdrivers. Also
create unique test-gen files for RuntimeGenerator tests.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855
--
https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/GenZorbaRuntime.cmake'
--- cmake_modules/GenZorbaRuntime.cmake 2012-09-19 21:16:15 +
+++ cmake_modules/GenZorbaRuntime.cmake 2013-02-12 08:51:26 +
@@ -68,8 +68,7 @@
# If we are testing the generation, overwrite gen_file with a dummy location.
IF(test_only)
STRING(REGEX REPLACE [/\\] _ gen_file ${gen_relfilename})
- SET(gen_file ${binary_dir}/gen_test.tmp.${gen_file})
- MESSAGE( dobbbling: ${gen_file})
+ SET(gen_file ${binary_dir}/test/GenZorbaRuntime/${gen_relfile})
ENDIF(test_only)
=== modified file 'test/rbkt/CMakeLists.txt'
--- test/rbkt/CMakeLists.txt 2012-09-19 21:16:15 +
+++ test/rbkt/CMakeLists.txt 2013-02-12 08:51:26 +
@@ -15,11 +15,6 @@
ADD_SUBDIRECTORY(Scripts)
ADD_SUBDIRECTORY(ExpCompilerResults)
-# create the result directory for all tests
-IF (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/QueryResults/)
-FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/QueryResults/)
-ENDIF (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/QueryResults/)
-
# configure the testdriver
CONFIGURE_FILE(testdriverconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/testdriverconfig.h)
=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt 2013-01-24 10:49:06 +
+++ test/rbkt/Queries/CMakeLists.txt 2013-02-12 08:51:26 +
@@ -18,6 +18,9 @@
MESSAGE(STATUS Adding tests for CTest)
+# Compute results directory for testdriver
+SET (_results_dir ${CMAKE_CURRENT_BINARY_DIR}/../QueryResults)
+
FILE(GLOB_RECURSE TESTFILES FOLLOW_SYMLINKS
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xq)
IF(ZORBA_TEST_XQUERYX)
@@ -91,6 +94,10 @@
# finally add the test
ZORBA_ADD_TEST(${TEST_NAME} testdriver ${CHAINED_TESTS_FILES})
+# Create directory for output, if it doesn't exit
+IF (NOT EXISTS ${_results_dir}/${CT})
+ FILE (MAKE_DIRECTORY ${_results_dir}/${CT})
+ENDIF (NOT EXISTS ${_results_dir}/${CT})
# clear the list of testfiles, args and also the name of the test
SET(CHAINED_TESTS_FILES)
@@ -197,6 +204,12 @@
ZORBA_ADD_TEST(${TESTNAME} testdriver ${TESTFILE})
+# Create directory for output, if it doesn't exist
+GET_FILENAME_COMPONENT(_bucket_path ${TESTFILE} PATH)
+IF (NOT EXISTS ${_results_dir}/${_bucket_path})
+ FILE (MAKE_DIRECTORY ${_results_dir}/${_bucket_path})
+ENDIF (NOT EXISTS ${_results_dir}/${_bucket_path})
+
MATH(EXPR TESTCOUNTER ${TESTCOUNTER}+1)
MATH(EXPR TESTMOD ${TESTCOUNTER}/1000)
IF (${TESTMOD})
=== modified file 'test/rbkt/testdriver.cpp'
--- test/rbkt/testdriver.cpp 2013-02-08 00:42:44 +
+++ test/rbkt/testdriver.cpp 2013-02-12 08:51:26 +
@@ -216,15 +216,7 @@
zorba::file lResultFile (rbkt_bin_dir + /QueryResults/
+ lQueryWithoutSuffix + .xml.res, path_flags);
-zorba::file lErrorFile (rbkt_bin_dir + /
- + lQueryWithoutSuffix + .err, path_flags);
-
if ( lResultFile.exists () ) { lResultFile.remove (); }
-if ( lErrorFile.exists () ) { lErrorFile.remove (); }
-
-zorba::file lBucket (lResultFile.branch_path());
-if ( ! lBucket.exists () )
- lBucket.deep_mkdir (); // create deep directories
// Form the full pathname for the .spec file that may be associated
// with this query. If the .spec file exists, read its contents to
=== modified file 'test/sax2/CMakeLists.txt'
--- test/sax2/CMakeLists.txt 2012-09-19 21:16:15 +
+++ test/sax2/CMakeLists.txt 2013-02-12 08:51:26 +
@@ -12,11 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# create the result directory for all tests
-IF (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/QueryResults/)
-FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/QueryResults/)
-ENDIF (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/QueryResults/)
-
# configure the testdriver
CONFIGURE_FILE(sax2testdriverconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/sax2testdriverconfig.h)
@@ -31,6 +26,9 @@
ZORBA_GENERATE_EXE(sax2testdriver ${SAX2_TESTDRIVER_SRCS} )
+# Compute results directory for testdriver
+SET (_results_dir ${CMAKE_CURRENT_BINARY_DIR}/QueryResults)
+
# collect all queries (suffix .xq) in all subdirectories of the Queries dir
FILE(GLOB_RECURSE TESTFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/Queries/ *.xq)
@@ -45,6 +43,13 @@
SET (TESTNAME test/sax2/${TESTNAME})
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Commit Message changed to: Test fixes to ensure all tests can be run in parallel. In particular: create all .res file output directories at CMake time, not in the testdrivers. Also create unique test-gen files for RuntimeGenerator tests. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ctest-j8-2013-02-12T08-50-50.202Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job ctest-j8-2013-02-12T08-50-50.202Z is finished. The final status was: 961 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ctest-j8-2013-02-12T09-32-45.691Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
Validation queue job ctest-j8-2013-02-12T09-32-45.691Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ctest-j8-2013-02-13T01-32-56.61Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
Validation queue job ctest-j8-2013-02-13T01-32-56.61Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147855 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147266 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147266 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/ctest-j8 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/ctest-j8-2013-02-08T01-20-39.373Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147266 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/ctest-j8 into lp:zorba
Validation queue job ctest-j8-2013-02-08T01-20-39.373Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147266 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/ctest-j8 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/ctest-j8 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147266 -- https://code.launchpad.net/~zorba-coders/zorba/ctest-j8/+merge/147266 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
