diff options
| -rw-r--r-- | tests/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/integration/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/integration/indicator-sound-test-base.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index bf0b5ab..131a648 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,7 +14,7 @@ set_source_files_properties (gschemas.compiled GENERATED) # compile the indicator-sound schema into a gschemas.compiled file in this directory, # and help the tests to find that file by setting -DSCHEMA_DIR set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas") -set (FAKE_HOME "${CMAKE_CURRENT_BINARY_DIR}/fake-home") +set (TEST_HOME "${CMAKE_CURRENT_BINARY_DIR}/test-home") set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas") if (EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml) set (SOUND_SCHEMA /usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml) @@ -32,8 +32,8 @@ add_custom_command (OUTPUT gschemas.compiled COMMAND cp -f ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.sound.gschema.xml ${SCHEMA_DIR} COMMAND cp -f ${SOUND_SCHEMA} ${SCHEMA_DIR} COMMAND ${COMPILE_SCHEMA_EXECUTABLE} ${SCHEMA_DIR}) -add_custom_command (OUTPUT fake-home - COMMAND mkdir -p $(FAKE_HOME)) +add_custom_command (OUTPUT test-home + COMMAND mkdir -p $(TEST_HOME)) ########################### # Vala Mocks diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 452006b..623fbc4 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -32,7 +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}" - -DFAKE_HOME="${FAKE_HOME}" + -DTEST_HOME="${TEST_HOME}" ) if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.AccountsService.Sound.xml") diff --git a/tests/integration/indicator-sound-test-base.cpp b/tests/integration/indicator-sound-test-base.cpp index fcc44ad..46d6247 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -54,7 +54,7 @@ IndicatorSoundTestBase::~IndicatorSoundTestBase() void IndicatorSoundTestBase::SetUp() { - setenv("HOME", FAKE_HOME, true); + setenv("HOME", TEST_HOME, true); setenv("XDG_DATA_DIRS", XDG_DATA_DIRS, true); setenv("DBUS_SYSTEM_BUS_ADDRESS", dbusTestRunner.systemBus().toStdString().c_str(), true); setenv("DBUS_SESSION_BUS_ADDRESS", dbusTestRunner.sessionBus().toStdString().c_str(), true); |