From b598e7cb3fc5491d93debde743f5e67037dfb6f1 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 8 Jan 2013 10:33:31 -0500 Subject: More traces --- tests/Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tests/Makefile.am') 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 -- cgit v1.2.3 From fc8b73e958822e33c7dd8e3034bfdcc6addfe464 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 23 Jan 2013 14:16:37 -0500 Subject: Increase dbus-test-runner timeout to 5 minutes to give tests enough time to start up and run on buildds, especially on slow architectures. --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 4d3be1c..3a1ecaf 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -170,7 +170,7 @@ TESTS += libappindicator-tests DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT) libappindicator-tests-gtester -DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf +DBUS_RUNNER=dbus-test-runner -m 300 --dbus-config /usr/share/dbus-test-runner/session.conf test-libappindicator-dbus: test-libappindicator-dbus-client test-libappindicator-dbus-server Makefile.am @echo "#!/bin/bash" > test-libappindicator-dbus -- cgit v1.2.3