aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-11-23 12:41:03 +0000
committerTarmac <>2012-11-23 12:41:03 +0000
commitde8eea63b919b81132895dfe04ed676778c53f6f (patch)
tree44c6e55fdfc9dcafa916c7dbc4c737fee80019e9
parent374e999b82edf8ac36bf88521102bc87c30c596c (diff)
parent560f14fe8484c0b0cf935147a050ab9df241b2a9 (diff)
downloadqmenumodel-de8eea63b919b81132895dfe04ed676778c53f6f.tar.gz
qmenumodel-de8eea63b919b81132895dfe04ed676778c53f6f.tar.bz2
qmenumodel-de8eea63b919b81132895dfe04ed676778c53f6f.zip
Added 'TEST_XML_OUTPUT' option on cmake to enable/disalbe test output in xml.
OBS: The default value is On. Approved by Michael Zanetti, PS Jenkins bot.
-rw-r--r--CMakeLists.txt1
-rw-r--r--tests/client/CMakeLists.txt8
2 files changed, 8 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f60630..f3799b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ endif()
add_subdirectory(libqmenumodel)
# Tests Tools
+OPTION(TEST_XML_OUTPUT "Print test results on xml files" ON)
if(NOT DBUS_RUNNER)
message(STATUS "dbus-test-runner not found tests disabled.")
else()
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index d946fad..392437c 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -8,9 +8,15 @@ macro(declare_test testname)
${GIO_LDFLAGS}
)
+ if(TEST_XML_OUTPUT)
+ set(TEST_ARGS -p -xunitxml -p -o -p test_${testname}.xml)
+ else()
+ set(TEST_ARGS "")
+ endif()
+
add_test(${testname}
${DBUS_RUNNER}
- --task ${CMAKE_CURRENT_BINARY_DIR}/${testname} -p -xunitxml -p -o -p test_${testname}.xml --task-name Client
+ --task ${CMAKE_CURRENT_BINARY_DIR}/${testname} ${TEST_ARGS} --task-name Client
--task ${CMAKE_CURRENT_SOURCE_DIR}/script_${testname}.py --task-name Server
--ignore-return)
set_tests_properties(${testname} PROPERTIES