diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2016-03-11 14:06:34 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2016-03-11 14:06:34 -0600 |
| commit | 0734731e7296f84ab30ac403886635b7cb89da49 (patch) | |
| tree | 2ce36bf6cd59e8e2e5165a8be59e0c0ab7222f7b /tests | |
| parent | d8ef8e68805ab7f53258427c79ee5aaafec916ba (diff) | |
| download | ayatana-indicator-display-0734731e7296f84ab30ac403886635b7cb89da49.tar.gz ayatana-indicator-display-0734731e7296f84ab30ac403886635b7cb89da49.tar.bz2 ayatana-indicator-display-0734731e7296f84ab30ac403886635b7cb89da49.zip | |
clean up compile_options and warnings. Add DBUS debug log messages to ctest environment variables.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/integration/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index be0000d..7be2acd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -16,14 +16,17 @@ include_directories(SYSTEM ${GMOCK_INCLUDE_DIRS} ) -set(CTEST_ENVIRONMENT "${CTEST_ENVIRONMENT};G_MESSAGES_DEBUG=all") +list(APPEND CTEST_ENVIRONMENT + G_MESSAGES_DEBUG=all + G_DBUS_DEBUG=call,signal,return,message +) # turn off the warnings that break Google Test if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CXX_WARNING_ARGS "${CXX_WARNING_ARGS} -Wno-global-constructors -Wno-weak-vtables") + list(APPEND CXX_WARNING_ARGS -Wno-global-constructors -Wno-weak-vtables) endif() -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNING_ARGS}") +add_compile_options(${CXX_WARNING_ARGS}) add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr -I${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests) diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index c04ecc8..1eb7b3e 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -18,7 +18,7 @@ function(add_qt_test_by_name name) set(TEST_NAME ${name}) add_executable (${TEST_NAME} ${TEST_NAME}.cpp) add_test(${TEST_NAME} ${TEST_NAME}) - set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT "${CTEST_ENVIRONMENT}") + set_property(TEST ${TEST_NAME} APPEND PROPERTY ENVIRONMENT ${CTEST_ENVIRONMENT}) target_link_libraries(${TEST_NAME} ${SERVICE_LINK_LIBRARIES} ${QT_LINK_LIBRARIES} ${TEST_LINK_LIBRARIES}) endfunction() add_qt_test_by_name(usb-manager-test) |