aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-01-08 10:33:31 -0500
committerMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2013-01-08 10:33:31 -0500
commitb598e7cb3fc5491d93debde743f5e67037dfb6f1 (patch)
tree9495bf7eccab6eaf081d0dff58fc2f0ed8a5a4b1
parent59a0f715f324fb45001364a5876a6fd0b51a107a (diff)
downloadlibayatana-appindicator-b598e7cb3fc5491d93debde743f5e67037dfb6f1.tar.gz
libayatana-appindicator-b598e7cb3fc5491d93debde743f5e67037dfb6f1.tar.bz2
libayatana-appindicator-b598e7cb3fc5491d93debde743f5e67037dfb6f1.zip
More traces
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/rules4
-rw-r--r--tests/Makefile.am8
3 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3b8c5b0..52eed2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low
+libappindicator (12.10.9-0ubuntu1~mtrudel1) raring; urgency=low
* debian/control:
- Update style: use trailing commas at the end of dependency lists.
diff --git a/debian/rules b/debian/rules
index 4637722..5da5273 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,8 @@ override_dh_install:
override_dh_auto_test: $(FLAVORS:%=dotest-%)
dotest-%:
+ ps -ef
+ env
dh_auto_test --builddirectory=build/$* --
@@ -79,6 +81,8 @@ dotest-gtk2: $(PY_VERSIONS:%=dotestgtk2-%)
# GTK2 flavor test was run on a per-python-version basis.
dotestgtk2-%:
+ ps -ef
+ env
PYTHON=`which $*` \
dh_auto_test --builddirectory=build/gtk2 --
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a65f320..4d3be1c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -137,6 +137,8 @@ test_libappindicator_fallback_item_LDADD = \
test-libappindicator-fallback: test-libappindicator-fallback-watcher test-libappindicator-fallback-item Makefile.am
@echo "#!/bin/bash" > $@
+ @echo export DISPLAY= >> $@
+ @echo killall at-spi2-registryd >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task ./test-libappindicator-fallback-watcher --task-name Watcher --ignore-return --task ./test-libappindicator-fallback-item --task-name Item >> $@
@chmod +x $@
@@ -152,6 +154,8 @@ HTML_REPORT = libappindicator-check-results.html
libappindicator-tests: libappindicator-tests-gtester Makefile.am
@echo "#!/bin/bash" > $@
+ @echo export DISPLAY= >> $@
+ @echo killall at-spi2-registryd >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo export UBUNTU_MENUPROXY= >> $@
@echo $(DBUS_RUNNER) --task ./libappindicator-tests-gtester >> $@
@@ -170,6 +174,8 @@ DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.c
test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am
@echo "#!/bin/bash" > test-libappindicator-dbus
+ @echo export DISPLAY= >> $@
+ @echo killall at-spi2-registryd >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task ./test-libappindicator-dbus-client --task-name Client --task ./test-libappindicator-dbus-server --task-name Server --ignore-return >> test-libappindicator-dbus
@chmod +x test-libappindicator-dbus
@@ -179,6 +185,8 @@ XFAIL_TESTS = test-libappindicator-dbus
test-libappindicator-status: test-libappindicator-status-client test-libappindicator-status-server Makefile.am
@echo "#!/bin/bash" > test-libappindicator-status
+ @echo export DISPLAY= >> $@
+ @echo killall at-spi2-registryd >> $@
@echo . $(srcdir)/run-xvfb.sh >> $@
@echo $(DBUS_RUNNER) --task ./test-libappindicator-status-client --task-name Client --task ./test-libappindicator-status-server --task-name Server --ignore-return >> test-libappindicator-status
@chmod +x test-libappindicator-status