diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-03-12 21:57:52 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-08-28 20:27:35 +0200 |
| commit | 05cb85567d0eea78a2407ee8367f50afcd14cc65 (patch) | |
| tree | 300149a426ad1d81056c297a751eb8211c91476a /tests/integration | |
| parent | bc163bb16505f6b9aef05173d868e5f60edcc504 (diff) | |
| download | ayatana-indicator-sound-05cb85567d0eea78a2407ee8367f50afcd14cc65.tar.gz ayatana-indicator-sound-05cb85567d0eea78a2407ee8367f50afcd14cc65.tar.bz2 ayatana-indicator-sound-05cb85567d0eea78a2407ee8367f50afcd14cc65.zip | |
tests/integration/: Properly set env variables for pulseaudio and assure dependencies to be in place.
Diffstat (limited to 'tests/integration')
| -rw-r--r-- | tests/integration/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 3 |
2 files changed, 19 insertions, 0 deletions
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 2bf808c..d20fa8f 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -32,6 +32,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/ayatana-indicator-s -DTEST_SOUND="${CMAKE_SOURCE_DIR}/tests/integration/test-sound.wav" -DQT_NO_KEYWORDS=1 -DXDG_DATA_DIRS="${XDG_DATA_DIRS}" + -DXDG_CONFIG_HOME="${XDG_CONFIG_HOME}" -DXDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" -DTEST_HOME="${TEST_HOME}" ) @@ -62,6 +63,11 @@ add_executable( ${INTEGRATION_TESTS_SRC} ) +add_dependencies( + integration-tests + test-home +) + qt5_use_modules( integration-tests Core @@ -117,11 +123,21 @@ add_executable( ${SET-VOLUME-SRC} ) +add_dependencies( + set-volume + test-home +) + add_executable( get-volume ${GET-VOLUME-SRC} ) +add_dependencies( + get-volume + test-home +) + qt5_use_modules( set-volume Core diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index cdc1b2a..010f8c4 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -57,6 +57,7 @@ void IndicatorSoundTestBase::SetUp() setenv("HOME", TEST_HOME, true); setenv("XDG_DATA_DIRS", XDG_DATA_DIRS, true); setenv("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true); + setenv("XDG_CONFIG_HOME", XDG_CONFIG_HOME, true); setenv("DBUS_SYSTEM_BUS_ADDRESS", dbusTestRunner.systemBus().toStdString().c_str(), true); setenv("DBUS_SESSION_BUS_ADDRESS", dbusTestRunner.sessionBus().toStdString().c_str(), true); dbusMock.registerNotificationDaemon(); @@ -82,6 +83,8 @@ void IndicatorSoundTestBase::SetUp() void IndicatorSoundTestBase::TearDown() { unsetenv("XDG_DATA_DIRS"); + unsetenv("XDG_RUNTIME_DIR"); + unsetenv("XDG_CONFIG_HOME"); unsetenv("HOME"); unsetenv("PULSE_SERVER"); unsetenv("DBUS_SYSTEM_BUS_ADDRESS"); |