diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-04 18:44:40 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-04 18:44:57 +0000 |
| commit | b89a27403d632725504c21c6079b936f9c1c6c9c (patch) | |
| tree | 4a3454000cc0ac8b24085efbd498e6a3f0e6e2ed /tests | |
| parent | b1970f4371d3efdf4a385cd6b4eebb6731fadd1c (diff) | |
| parent | 6ea034ad022068c581cdbf675a5be54e30d2e2f0 (diff) | |
Merge branch 'gsettings'
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Fixes: <https://bugs.freedesktop.org/show_bug.cgi?id=42068>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/twisted/tools/exec-with-log.sh.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/twisted/tools/exec-with-log.sh.in b/tests/twisted/tools/exec-with-log.sh.in index 84b13ea2..a7abbf91 100644 --- a/tests/twisted/tools/exec-with-log.sh.in +++ b/tests/twisted/tools/exec-with-log.sh.in @@ -51,7 +51,8 @@ elif test -n "$MISSIONCONTROL_TEST_REFDBG"; then fi # The bus-daemon that is activating us doesn't know it's also the system bus -export DBUS_SYSTEM_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" +DBUS_SYSTEM_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" +export DBUS_SYSTEM_BUS_ADDRESS if test "z$MC_EXECUTABLE" = z; then MC_EXECUTABLE=@abs_top_builddir@/tests/twisted/mc-debug-server @@ -63,6 +64,9 @@ if test -f "$MC_ACCOUNT_DIR/gnome-keyring-env"; then export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID MC_KEYRING_NAME SSH_AUTH_SOCK fi +GSETTINGS_SCHEMA_DIR=@abs_top_builddir@/data +export GSETTINGS_SCHEMA_DIR + exec @abs_top_builddir@/libtool --mode=execute \ $MISSIONCONTROL_WRAPPER \ $MC_EXECUTABLE |