Merge lp:~attente/indicator-keyboard/manually-set-xdg-runtime-dir into lp:indicator-keyboard

[William Hua]

Manually set XDG_RUNTIME_DIR to fix the tests.

GLib 32492c6ab0000c50564360c74acf069814d942d1 unsets it after g_test_dbus_up () and g_test_dbus_down (). We need it so that spawned calls to the GSettings CLI tool knows what DBus socket to use.

Manually set XDG_RUNTIME_DIR to fix the tests.

GLib 32492c6ab0000c50564360c74acf069814d942d1 unsets it after g_test_dbus_up () and g_test_dbus_down (). We need it so that spawned calls to the GSettings CLI tool knows what DBus socket to use.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:876
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-ci/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-vivid-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-vivid-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-15.04-ci/1/rebuild

review: Needs Fixing (continuous-integration)

[lp:~attente/indicator-keyboard/manually-set-xdg-runtime-dir]

877. By William Hua on 2015-10-06

Manually set GDK_BACKEND=x11.

GDK wants to try Wayland first, which causes indicator-keyboard-service to fail if XDG_RUNTIME_DIR is longer than 108 characters.

[Sebastien Bacher (seb128)]

that does the trick, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:877
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-vivid-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-15.04-vivid-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-15.04-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:877
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-keyboard-ci/80/rebuild

review: Approve (continuous-integration)

=== modified file 'po/Makefile.in.in'
--- po/Makefile.in.in	2013-06-10 13:41:00 +0000
+++ po/Makefile.in.in	2015-10-06 16:57:32 +0000
@@ -33,8 +33,7 @@
 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 @@
 
 .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-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 @@
 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

=== modified file 'tests/config.vala.in'
--- tests/config.vala.in	2013-06-27 05:04:55 +0000
+++ tests/config.vala.in	2015-10-06 16:57:32 +0000
@@ -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";

=== modified file 'tests/indicator-keyboard-test.in'
--- tests/indicator-keyboard-test.in	2014-06-16 17:03:40 +0000
+++ tests/indicator-keyboard-test.in	2015-10-06 16:57:32 +0000
@@ -5,6 +5,7 @@
 export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data"
 export XDG_RUNTIME_DIR="@abs_top_builddir@/tests"
 export GTK_IM_MODULE="ibus"
+export GDK_BACKEND="x11"
 
 if xvfb-run -a ./indicator-keyboard-tests
 then

=== modified file 'tests/main.vala'
--- tests/main.vala	2014-02-19 15:09:16 +0000
+++ tests/main.vala	2015-10-06 16:57:32 +0000
@@ -77,6 +77,8 @@
 		((!) _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 @@
 		if (_bus != null) {
 			((!) _bus).down ();
 			_bus = null;
+
+			Environment.set_variable ("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true);
 		}
 	}