← Back to branch summary

~indicator-applet-developers/libappindicator/trunk.devel

« back to all changes in this revision

Viewing changes to tests/Makefile.am

  • Committer: Tarmac
  • Author(s): Charles Kerr, Mathieu Trudel-Lapierre, Michael Terry
  • Date: 2013-01-30 11:06:26 UTC
  • mfrom: (247.1.6 fix-test-merge)
  • Revision ID: tarmac-20130130110626-l39zryx7jn4mcskg
This is a continuation of ~mathieu-tl/libappindicator/fix-test-merge/ which adds fixes for bug #1102589, bug #1102595, bug #1109128, and bug #1103087, which should get it finally passing CI. Fixes: https://bugs.launchpad.net/bugs/1102589, https://bugs.launchpad.net/bugs/1102595, https://bugs.launchpad.net/bugs/1103087, https://bugs.launchpad.net/bugs/1109128.

Approved by Ted Gould, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/Makefile.am
137
137
 
138
138
test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
139
139
        @echo "#!/bin/bash" > $@
 
140
        @echo export DISPLAY= >> $@
 
141
        @echo killall at-spi2-registryd >> $@
140
142
        @echo . $(srcdir)/run-xvfb.sh >> $@
141
143
        @echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@
142
144
        @chmod +x $@
152
154
 
153
155
libappindicator-tests: libappindicator-tests-gtester Makefile.am
154
156
        @echo "#!/bin/bash" > $@
 
157
        @echo export DISPLAY= >> $@
 
158
        @echo killall at-spi2-registryd >> $@
155
159
        @echo . $(srcdir)/run-xvfb.sh >> $@
156
160
        @echo export UBUNTU_MENUPROXY= >> $@
157
161
        @echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@
166
170
DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libappindicator-tests-gtester
167
171
 
168
172
 
169
 
DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
 
173
DBUS_RUNNER=dbus-test-runner -m 300 --dbus-config /usr/share/dbus-test-runner/session.conf
170
174
 
171
175
test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
172
176
        @echo "#!/bin/bash" > test-libappindicator-dbus
 
177
        @echo export DISPLAY= >> $@
 
178
        @echo killall at-spi2-registryd >> $@
173
179
        @echo . $(srcdir)/run-xvfb.sh >> $@
174
180
        @echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus
175
181
        @chmod +x test-libappindicator-dbus
179
185
 
180
186
test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
181
187
        @echo "#!/bin/bash" > test-libappindicator-status
 
188
        @echo export DISPLAY= >> $@
 
189
        @echo killall at-spi2-registryd >> $@
182
190
        @echo . $(srcdir)/run-xvfb.sh >> $@
183
191
        @echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
184
192
        @chmod +x test-libappindicator-status