diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-06-02 12:22:59 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-06-08 17:00:38 +0100 |
| commit | cc1ee6c39dafd8d5e24b94739131ecf4ef5c4c5b (patch) | |
| tree | 2e8a4995f0004721b5d54c166bb80daca56addca /cmake | |
| parent | bde40c8970d7e1314edc9f84d5bf55c7fc6d8e57 (diff) | |
| download | dbus-cc1ee6c39dafd8d5e24b94739131ecf4ef5c4c5b.tar.gz | |
test/dbus-daemon: Exercise the Peer interface
We have to skip the GetMachineId() part during build-time testing
if it wouldn't work - there is no guarantee that dbus has ever been
installed on the build system. However, we can insist on it during
installed-tests, if we make sure to complete the installation for the
Travis-CI build by running dbus-uuidgen.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101257
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/Macros.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/modules/Macros.cmake b/cmake/modules/Macros.cmake index d237521f..7ce07207 100644 --- a/cmake/modules/Macros.cmake +++ b/cmake/modules/Macros.cmake @@ -65,6 +65,7 @@ macro(add_test_executable _target _source) list(APPEND _env "DBUS_TEST_DBUS_LAUNCH=${PREFIX}${CMAKE_BINARY_DIR}/bin/dbus-launch${EXEEXT}") list(APPEND _env "DBUS_TEST_EXEC=${PREFIX}${DBUS_TEST_EXEC}") list(APPEND _env "DBUS_TEST_HOMEDIR=${PREFIX}${CMAKE_BINARY_DIR}/dbus") + list(APPEND _env "DBUS_TEST_UNINSTALLED=1") set_tests_properties(${_target} PROPERTIES ENVIRONMENT "${_env}") endmacro(add_test_executable) |