diff options
| author | Allen Winter <winter@kde.org> | 2007-09-12 13:31:21 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2007-09-12 13:31:21 +0000 |
| commit | 33a5cc9e620d667543453dc455b1004b94fff702 (patch) | |
| tree | d48cbaf800b92a7ed6727c0d5de80f18f7df9346 | |
| parent | 1e04907bba497d5d24d50d0320631ed7d13e4318 (diff) | |
| download | extra-cmake-modules-33a5cc9e620d667543453dc455b1004b94fff702.tar.gz extra-cmake-modules-33a5cc9e620d667543453dc455b1004b94fff702.tar.bz2 | |
Commit Thibault's and Andreas' patch that allows XML output for QTestLib
unit tests. To use, one must run cmake with the -DKDE4_TEST_OUTPUT=xml option.
Else, the output format is typical plain text.
CCMAIL: thibault.normand@gmail.com,apaku@gmx.de,ervin@kde.org
svn path=/trunk/KDE/kdelibs/; revision=711631
| -rw-r--r-- | modules/KDE4Macros.cmake | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 0be16ff1..c8260f85 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -695,7 +695,31 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME) list(REMOVE_AT _srcList 0 1) endif( ${ARGV1} STREQUAL "TESTNAME" ) kde4_add_test_executable( ${_test_NAME} ${_srcList} ) - add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} ) + + if(NOT KDE4_TEST_OUTPUT) + set(KDE4_TEST_OUTPUT plaintext) + endif(NOT KDE4_TEST_OUTPUT) + set(KDE4_TEST_OUTPUT ${KDE4_TEST_OUTPUT} CACHE STRING "The output to generate when running the QTest unit tests") + + set(using_qtest "") + foreach(_filename ${_srcList}) + if(NOT using_qtest) + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}") + file(READ ${_filename} file_CONTENT) + string(REGEX MATCH "QTEST_(KDE)?MAIN" using_qtest "${file_CONTENT}") + endif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${_filename}") + endif(NOT using_qtest) + endforeach(_filename) + + if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") + #MESSAGE(STATUS "${_targetName} : Using QTestLib, can produce XML report.") + add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_targetName}.tml) + else (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") + #MESSAGE(STATUS "${_targetName} : NOT using QTestLib, can't produce XML report, please use QTestLib to write your unit tests.") + add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} ) + endif (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") + +# add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml ) if (NOT MSVC_IDE) #not needed for the ide # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all tests |