diff options
| author | Senko Rasic <senko.rasic@collabora.co.uk> | 2010-06-21 11:23:26 +0200 |
|---|---|---|
| committer | Senko Rasic <senko.rasic@collabora.co.uk> | 2010-09-14 14:28:09 +0200 |
| commit | cf5af66a60fa318e4233d73a9f1c286dca4ec3b8 (patch) | |
| tree | 289d827d6fc130d4b4d648c745fcc7dec9b457ba | |
| parent | 23320b621c85ed0984cfa0a628cfaf34c1ebf206 (diff) | |
| download | telepathy-mission-control-cf5af66a60fa318e4233d73a9f1c286dca4ec3b8.tar.gz | |
set proper environment flags when testing with gnome-keyring
| -rw-r--r-- | test/twisted/Makefile.am | 5 | ||||
| -rw-r--r-- | test/twisted/tools/exec-with-log.sh.in | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/test/twisted/Makefile.am b/test/twisted/Makefile.am index 8df2d056..43ac55d1 100644 --- a/test/twisted/Makefile.am +++ b/test/twisted/Makefile.am @@ -140,11 +140,16 @@ BASIC_TESTS_ENVIRONMENT = \ XDG_CONFIG_DIRS=@abs_top_srcdir@/test/twisted \ XDG_DATA_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \ XDG_DATA_DIRS=@abs_top_srcdir@/test/twisted \ + XDG_CACHE_DIR=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \ XDG_CACHE_HOME=@abs_top_builddir@/test/twisted/tmp-$(TMPSUFFIX) \ MC_CLIENTS_DIR=@abs_top_srcdir@/test/twisted/telepathy/clients \ MC_MANAGER_DIR=@abs_top_srcdir@/test/twisted/telepathy/managers \ G_DEBUG=fatal_criticals +if ENABLE_GNOME_KEYRING +BASIC_TESTS_ENVIRONMENT += MC_TEST_GNOME_KEYRING=1 +endif + WITH_SESSION_BUS = \ sh $(srcdir)/tools/with-session-bus.sh \ --config-file=tools/tmp-session-bus.conf -- diff --git a/test/twisted/tools/exec-with-log.sh.in b/test/twisted/tools/exec-with-log.sh.in index 16422207..73f3a3d2 100644 --- a/test/twisted/tools/exec-with-log.sh.in +++ b/test/twisted/tools/exec-with-log.sh.in @@ -54,6 +54,12 @@ if test "z$MC_EXECUTABLE" = z; then MC_EXECUTABLE=@abs_top_builddir@/test/twisted/mc-debug-server fi +if test -f "$MC_ACCOUNT_DIR/gnome-keyring-env"; then + cat "$MC_ACCOUNT_DIR/gnome-keyring-env" + . "$MC_ACCOUNT_DIR/gnome-keyring-env" + export GNOME_KEYRING_CONTROL GNOME_KEYRING_PID MC_KEYRING_NAME SSH_AUTH_SOCK +fi + exec @abs_top_builddir@/libtool --mode=execute \ $MISSIONCONTROL_WRAPPER \ $MC_EXECUTABLE |