diff options
| -rw-r--r-- | tests/accounts-mock/main.cpp | 5 | ||||
| -rw-r--r-- | tests/integration/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/tests/accounts-mock/main.cpp b/tests/accounts-mock/main.cpp index ca1a426..04ec530 100644 --- a/tests/accounts-mock/main.cpp +++ b/tests/accounts-mock/main.cpp @@ -53,6 +53,9 @@ int main(int argc, char *argv[]) qFatal("Could not register Accounts object."); } } - qDebug() << "Service is already registered!."; + else + { + qDebug() << "Service is already registered!."; + } return app.exec(); } diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index ace155a..52c4e70 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -32,6 +32,7 @@ add_definitions(-DSOUND_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator-sound-ser -DACCOUNTS_SERVICE_BIN="${CMAKE_BINARY_DIR}/tests/accounts-mock/accounts-service-sound" -DTEST_SOUND="${CMAKE_SOURCE_DIR}/tests/integration/test-sound.wav" -DQT_NO_KEYWORDS=1 + -DSCHEMA_DIR="${SCHEMA_DIR}" ) set(GLIB_REQUIRED_VERSION 2.26) diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index 10717c7..49e2ec5 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -163,11 +163,15 @@ mh::MenuMatcher::Parameters IndicatorSoundTestBase::desktopParameters() void IndicatorSoundTestBase::SetUp() { + setenv("GSETTINGS_SCHEMA_DIR", SCHEMA_DIR, true); + setenv("GSETTINGS_BACKEND", "memory", true); setenv("DBUS_SYSTEM_BUS_ADDRESS", dbusTestRunner.systemBus().toStdString().c_str(), true); } void IndicatorSoundTestBase::TearDown() { + unsetenv("GSETTINGS_SCHEMA_DIR"); + unsetenv("GSETTINGS_BACKEND"); unsetenv("PULSE_SERVER"); } |