Indicator keyboard

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

  1. manually-set-xdg-runtime-dir
  2. Merge into trunk
Proposed by William Hua
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 877
Merged at revision: 878
Proposed branch: lp:~attente/indicator-keyboard/manually-set-xdg-runtime-dir
Merge into: lp:indicator-keyboard
Diff against target: 83 lines (+11/-6)
4 files modified
po/Makefile.in.in (+5/-6)
tests/config.vala.in (+1/-0)
tests/indicator-keyboard-test.in (+1/-0)
tests/main.vala (+4/-0)
To merge this branch: bzr merge lp:~attente/indicator-keyboard/manually-set-xdg-runtime-dir
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Sebastien Bacher Approve
Review via email: mp+273451@code.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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 updated
877. By William Hua

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.

Revision history for this message
Sebastien Bacher (seb128) wrote :

that does the trick, thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
33datadir = @datadir@33datadir = @datadir@
34datarootdir = @datarootdir@34datarootdir = @datarootdir@
35libdir = @libdir@35libdir = @libdir@
36DATADIRNAME = @DATADIRNAME@36localedir = @localedir@
37itlocaledir = $(prefix)/$(DATADIRNAME)/locale
38subdir = po37subdir = po
39install_sh = @install_sh@38install_sh = @install_sh@
40# Automake >= 1.8 provides @mkdir_p@.39# Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
8079
81.po.pox:80.po.pox:
82 $(MAKE) $(GETTEXT_PACKAGE).pot81 $(MAKE) $(GETTEXT_PACKAGE).pot
83 $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox82 $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
8483
85.po.mo:84.po.mo:
86 $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<85 $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
108install-data-yes: all107install-data-yes: all
109 linguas="$(USE_LINGUAS)"; \108 linguas="$(USE_LINGUAS)"; \
110 for lang in $$linguas; do \109 for lang in $$linguas; do \
111 dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \110 dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
112 $(mkdir_p) $$dir; \111 $(mkdir_p) $$dir; \
113 if test -r $$lang.gmo; then \112 if test -r $$lang.gmo; then \
114 $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \113 $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
142uninstall:141uninstall:
143 linguas="$(USE_LINGUAS)"; \142 linguas="$(USE_LINGUAS)"; \
144 for lang in $$linguas; do \143 for lang in $$linguas; do \
145 rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \144 rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
146 rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \145 rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
147 done146 done
148147
149check: all $(GETTEXT_PACKAGE).pot148check: all $(GETTEXT_PACKAGE).pot
150149
=== 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 @@
1const string DCONF_PROFILE = "@abs_top_builddir@/tests/profiles/indicator-keyboard-test";1const string DCONF_PROFILE = "@abs_top_builddir@/tests/profiles/indicator-keyboard-test";
2const string SERVICE_DIR = "@abs_top_builddir@/tests/services";2const string SERVICE_DIR = "@abs_top_builddir@/tests/services";
3const string XDG_RUNTIME_DIR = "@abs_top_builddir@/tests";
34
=== 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 @@
5export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data"5export GSETTINGS_SCHEMA_DIR="@abs_top_builddir@/data"
6export XDG_RUNTIME_DIR="@abs_top_builddir@/tests"6export XDG_RUNTIME_DIR="@abs_top_builddir@/tests"
7export GTK_IM_MODULE="ibus"7export GTK_IM_MODULE="ibus"
8export GDK_BACKEND="x11"
89
9if xvfb-run -a ./indicator-keyboard-tests10if xvfb-run -a ./indicator-keyboard-tests
10then11then
1112
=== 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 @@
77 ((!) _bus).add_service_dir (SERVICE_DIR);77 ((!) _bus).add_service_dir (SERVICE_DIR);
78 ((!) _bus).up ();78 ((!) _bus).up ();
7979
80 Environment.set_variable ("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true);
81
80 var loop = new MainLoop (null, false);82 var loop = new MainLoop (null, false);
8183
82 _service_name = Bus.own_name (BusType.SESSION,84 _service_name = Bus.own_name (BusType.SESSION,
@@ -130,6 +132,8 @@
130 if (_bus != null) {132 if (_bus != null) {
131 ((!) _bus).down ();133 ((!) _bus).down ();
132 _bus = null;134 _bus = null;
135
136 Environment.set_variable ("XDG_RUNTIME_DIR", XDG_RUNTIME_DIR, true);
133 }137 }
134 }138 }
135139

Subscribers

People subscribed via source and target branches

to all changes: