From 568a977ebea54e30074d7f99e7e85306da2482df Mon Sep 17 00:00:00 2001
From: William Hua <william.hua@canonical.com>
Date: Mon, 5 Oct 2015 14:13:43 -0400
Subject: Manually set XDG_RUNTIME_DIR.

GLib 32492c6ab0000c50564360c74acf069814d942d1 resets it after calling TestDBus.up () and TestDBus.down ().
---
 po/Makefile.in.in    | 11 +++++------
 tests/config.vala.in |  1 +
 tests/main.vala      |  4 ++++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 06a8cfe9..fcd2c3b7 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -33,8 +33,7 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 datarootdir = @datarootdir@
 libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@ INTLTOOL__v_MSGFMT_0 = @echo "  MSGFMT" $@;
 
 .po.pox:
 	$(MAKE) $(GETTEXT_PACKAGE).pot
-	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+	$(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
 
 .po.mo:
 	$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@ install-data-no: all
 install-data-yes: all
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+	  dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
 	  $(mkdir_p) $$dir; \
 	  if test -r $$lang.gmo; then \
 	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@ install-exec installcheck:
 uninstall:
 	linguas="$(USE_LINGUAS)"; \
 	for lang in $$linguas; do \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
 	done
 
 check: all $(GETTEXT_PACKAGE).pot
diff --git a/tests/config.vala.in b/tests/config.vala.in
index 7acae9de..ef533d33 100644
--- a/tests/config.vala.in
+++ b/tests/config.vala.in
@@ -1,2 +1,3 @@
 const string DCONF_PROFILE = "@abs_top_builddir@/tests/profiles/indicator-keyboard-test";
 const string SERVICE_DIR = "@abs_top_builddir@/tests/services";
+const string XDG_RUNTIME_DIR = "@abs_top_builddir@/tests";
diff --git a/tests/main.vala b/tests/main.vala
index dca3b8b2..e2782d1d 100644
--- a/tests/main.vala
+++ b/tests/main.vala
@@ -77,6 +77,8 @@ public class Tests : Object, Fixture {
 		((!) _bus).add_service_dir (SERVICE_DIR);
 		((!) _bus).up ();
 
+		Environment.set_variable ("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true);
+
 		var loop = new MainLoop (null, false);
 
 		_service_name = Bus.own_name (BusType.SESSION,
@@ -130,6 +132,8 @@ public class Tests : Object, Fixture {
 		if (_bus != null) {
 			((!) _bus).down ();
 			_bus = null;
+
+			Environment.set_variable ("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true);
 		}
 	}
 
-- 
cgit v1.2.3