From 73262741e8480f6161659275c9d9239e6351d011 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 13 Jan 2018 00:52:50 +0100 Subject: tests/integration/: Provider a FAKE_HOME for pulseaudio to have a secure location for its user config files. --- tests/CMakeLists.txt | 3 +++ tests/integration/CMakeLists.txt | 1 + tests/integration/indicator-sound-test-base.cpp | 2 ++ 3 files changed, 6 insertions(+) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8666e6d..bf0b5ab 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,6 +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 (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) @@ -31,6 +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)) ########################### # Vala Mocks diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index bee5451..a19c789 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}" + -DFAKE_HOME="${FAKE_HOME}" ) 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 01d6f55..1f10dbe 100644 --- a/tests/integration/indicator-sound-test-base.cpp +++ b/tests/integration/indicator-sound-test-base.cpp @@ -54,6 +54,7 @@ IndicatorSoundTestBase::~IndicatorSoundTestBase() void IndicatorSoundTestBase::SetUp() { + setenv("HOME", FAKE_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); @@ -80,6 +81,7 @@ void IndicatorSoundTestBase::SetUp() void IndicatorSoundTestBase::TearDown() { unsetenv("XDG_DATA_DIRS"); + unsetenv("HOME"); unsetenv("PULSE_SERVER"); unsetenv("DBUS_SYSTEM_BUS_ADDRESS"); } -- cgit v1.2.3