Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots-ctest into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots-ctest into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fots-ctest-2013-01-08T22-37-44.816Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
Validation queue job fots-ctest-2013-01-08T22-37-44.816Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots-ctest into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/fots-ctest into
lp:zorba.
Commit message:
CTest integration for FOTS driver. Allows automated import of FOTS, and
enabling one CTest test per FOTS test set *or* per FOTS test case.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071
--
https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-10-08 12:09:36 +
+++ CMakeLists.txt 2012-12-05 09:16:21 +
@@ -550,12 +550,16 @@
ADD_SUBDIRECTORY(scripts)
ADD_SUBDIRECTORY(cmake_modules)
-# Subdirectory ordering: We need to include test before config so
-# ZorbaConfig knows about testdriver. We need to include config
-# before modules so external modules will be able to find
-# ZorbaConfig.cmake. We need to include modules before include so
-# config.h can know eg. whether we found CURL. We need to include modules
-# before doc so xqdoc can know what non-core modules are available.
+# Subdirectory ordering: We need to include bin before test so
+# that test/fots can add zorbacmd-based tests. We need to include
+# test before config so ZorbaConfig knows about testdriver. We
+# need to include config before modules so external modules will
+# be able to find ZorbaConfig.cmake. We need to include modules
+# before include so config.h can know eg. whether we found CURL. We
+# need to include modules before doc so xqdoc can know what
+# non-core modules are available.
+
+ADD_SUBDIRECTORY(bin)
ADD_SUBDIRECTORY(test)
ADD_SUBDIRECTORY(config)
@@ -572,8 +576,6 @@
ADD_SUBDIRECTORY (swig)
ENDIF (SWIG_FOUND)
-ADD_SUBDIRECTORY(bin)
-
# add the uninstall support
# QQQ move to config/
CONFIGURE_FILE(
=== modified file 'bin/CMakeLists.txt'
--- bin/CMakeLists.txt 2012-11-08 21:57:10 +
+++ bin/CMakeLists.txt 2012-12-05 09:16:21 +
@@ -15,6 +15,8 @@
INCLUDE_DIRECTORIES(AFTER ${CMAKE_SOURCE_DIR}/src/)
INCLUDE_DIRECTORIES(AFTER ${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE(${CMAKE_SOURCE_DIR}/cmake_modules/ZorbaGenerateExe.cmake)
+
IF (ZORBA_WITH_DEBUGGER)
IF (NOT WIN32)
FIND_PACKAGE (Libedit)
@@ -49,7 +51,6 @@
path_util.cpp
)
-INCLUDE(${CMAKE_SOURCE_DIR}/cmake_modules/ZorbaGenerateExe.cmake)
ZORBA_GENERATE_EXE(zorbacmd ${SRCS} zorba bin)
=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt 2012-10-08 12:09:36 +
+++ test/CMakeLists.txt 2012-12-05 09:16:21 +
@@ -37,6 +37,8 @@
ADD_SUBDIRECTORY(update)
ADD_SUBDIRECTORY(sax2)
+ADD_SUBDIRECTORY(fots)
+
SET (TEST_PLAN_SERIALIZER_SRCS
test_plan_serializer.cpp
timer.cpp)
=== added directory 'test/fots'
=== added file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 1970-01-01 00:00:00 +
+++ test/fots/CMakeLists.txt 2012-12-05 09:16:21 +
@@ -0,0 +1,57 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the License);
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Add a target to import FOTS
+ADD_CUSTOM_TARGET(fots-import
+ COMMAND ${CMAKE_COMMAND}
+ -D ZORBA=${ZORBA_EXE}
+ -D BUILDDIR=${PROJECT_BINARY_DIR}
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/ImportFOTS.cmake)
+
+# Create cached version of activate setting
+SET (ZORBA_FOTS_ACTIVATE inactive CACHE STRING Which FOTS tests to activate)
+MARK_AS_ADVANCED (ZORBA_FOTS_ACTIVATE)
+
+# Add targets to set activate flag
+ADD_CUSTOM_TARGET(fots-activate-sets
+ COMMAND ${CMAKE_COMMAND}
+ -D ZORBA_FOTS_ACTIVATE=sets ${PROJECT_SOURCE_DIR}
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
+ADD_CUSTOM_TARGET(fots-activate-cases
+ COMMAND ${CMAKE_COMMAND}
+ -D ZORBA_FOTS_ACTIVATE=cases ${PROJECT_SOURCE_DIR}
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
+ADD_CUSTOM_TARGET(fots-deactivate
+ COMMAND ${CMAKE_COMMAND}
+ -D ZORBA_FOTS_ACTIVATE=inactive ${PROJECT_SOURCE_DIR}
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
+
+# Load FOTS test scripts (if they exist) depending on flag
+IF (${ZORBA_FOTS_ACTIVATE} STREQUAL sets)
+ MESSAGE (STATUS Adding FOTS test-set tests)
+ SET (_fotsscript ${CMAKE_CURRENT_BINARY_DIR}/FOTSSetTests.cmake)
+ELSEIF (${ZORBA_FOTS_ACTIVATE} STREQUAL cases)
+ MESSAGE (STATUS Adding FOTS test-case tests (may take a while...))
+ SET (_fotsscript ${CMAKE_CURRENT_BINARY_DIR}/FOTSCaseTests.cmake)
+ELSE (${ZORBA_FOTS_ACTIVATE} STREQUAL sets)
+ SET (_fotsscript )
+ENDIF (${ZORBA_FOTS_ACTIVATE} STREQUAL sets)
+IF (NOT
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots-ctest into lp:zorba
Sorin: Take a look at test/fots/README.TXT for an explanation of the integration I've done. Please try it out and let me know if you have problems. I don't think this is ready for merge yet since there is no integration with EXPECTED_FAILURE() or anything like it, which is why I haven't voted on it myself. A couple questions: 1. Can the result= attribute of a test-case in FOTS driver output have values other than pass or fail? Currently I am determining whether a CTest test passes based on this output. 2. Would it be useful (for developers) to also allow CTest tests based on FOTS dependencies? If so, is it possible to use cli.xq to get a list of tests for a dependency, and to execute all tests for a dependency? -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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/fots-ctest into lp:zorba
A couple questions: 1. Can the result= attribute of a test-case in FOTS driver output have values other than pass or fail? Currently I am determining whether a CTest test passes based on this output. I tried to make the default output of FOTS driver the exact thing needed for a W3C ocnformance submission. That is why the values of result are the ones defined in the: http://dev.w3.org/cvsweb/2011/QT3-test-suite/FOTSResults.xsd?rev=1.2;content-type=text%2Fplain xsd:simpleType name=resultStatusType 2. Would it be useful (for developers) to also allow CTest tests based on FOTS dependencies? If so, is it possible to use cli.xq to get a list of tests for a dependency, and to execute all tests for a dependency? I do believe this is useful, for instance to run only the tests that have a HOF dependency. :) I do think that is useful, and that is why this is already implemented: Please try running the FOTS driver CLI with: [...] -e mode:=list-test-cases -e dependency:=higherOrderFunctions or [...] -e mode:=run-test-sets -e testSetPrefixes:=prod -e dependency:=higherOrderFunctions_false this should be exactly what you asked for. The value passed to 'dependency' attribute should be in the form: VALUE_SATISFIED. If SATISFIED is missing, 'true' is assumed. the VALUE are the ones defined in the http://bazaar.launchpad.net/~zorba-coders/zorba/fots_driver/view/head:/test/fots_driver/FOTSZorbaManifest.xml -- https://code.launchpad.net/~zorba-coders/zorba/fots-ctest/+merge/138071 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
