ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/cape-girardeau/dbus-test-runner into lp:~ted/cape-girardeau/trunk.

    Requested reviews:
    Canonical Desktop Experience Team (canonical-dx-team)


Run the tests under dbus-test-runner to ensure that they can get a DBus bus.  This is especially relevant for builds on Hudson.
-- 
https://code.launchpad.net/~ted/cape-girardeau/dbus-test-runner/+merge/14391
Your team ayatana-commits is subscribed to branch lp:~ted/cape-girardeau/trunk.

=== modified file '.bzrignore'
--- .bzrignore	2009-10-22 14:30:59 +0000
+++ .bzrignore	2009-11-03 22:05:20 +0000
@@ -24,3 +24,4 @@
 tests/test-libcustomindicator-dbus-server
 tests/libcustomindicator-tests
 tests/test-libcustomindicator-dbus
+tests/libcustomindicator-tests-gtester

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2009-10-22 14:30:59 +0000
+++ tests/Makefile.am	2009-11-03 22:05:20 +0000
@@ -64,12 +64,17 @@
 XML_REPORT   = libcustomindicator-check-results.xml
 HTML_REPORT  = libcustomindicator-check-results.html
 
-libcustomindicator-tests: test-libcustomindicator
-	@echo "#!/bin/sh" > libcustomindicator-tests
-	@echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> libcustomindicator-tests
-	@chmod +x libcustomindicator-tests
-
-TESTS += libcustomindicator-tests
+libcustomindicator-tests: libcustomindicator-tests-gtester Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo $(DBUS_RUNNER) --task ./libcustomindicator-tests-gtester >> $@
+	@chmod +x $@
+
+libcustomindicator-tests-gtester: test-libcustomindicator Makefile.am
+	@echo "#!/bin/sh" > $@
+	@echo gtester -k --verbose -o=$(XML_REPORT) ./test-libcustomindicator >> $@
+	@chmod +x $@
+
+TESTS += libcustomindicator-tests libcustomindicator-tests-gtester
 DISTCLEANFILES += $(XML_REPORT) $(HTML_REPORT)