summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-11-21 16:14:26 +0000
committerMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-11-21 16:14:26 +0000
commit54131ca6a6e78c2ad94f2cf6919154f9b469f853 (patch)
tree082b808538ce1fd00219975ff1a945ac4a73f6fe /Makefile
parent965739d7b3f372c46c29201f9365132521256dd0 (diff)
fix deadlock in signals, add AccessDenied signal
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9bcd1e6..713a141 100644
--- a/Makefile
+++ b/Makefile
@@ -153,6 +153,7 @@ check:
( PASS=false; \
dbus-daemon --config-file=tmp-session.conf --print-pid --print-address=5 --fork >pid 5>address ; \
export DBUS_SESSION_BUS_ADDRESS=$$(cat address) ;\
+ dbus-monitor &> monitor.log & \
if make testrun ; then export PASS=true; fi ; \
kill $$(cat pid) ; \
if [[ "$$PASS" == "true" ]]; then exit 0; else exit 1; fi )
@@ -169,9 +170,9 @@ internal-cross-test: libdbus-java.so libdbus-java-$(VERSION).jar dbus-java-test-
two-part-test: libdbus-java.so libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar
( dbus-daemon --config-file=tmp-session.conf --print-pid --print-address=5 --fork >pid 5>address ; \
export DBUS_SESSION_BUS_ADDRESS=$$(cat address) ;\
- make -s two-part-server &\
+ make -s two-part-server | tee server.log &\
sleep 1;\
- make -s two-part-client ;\
+ make -s two-part-client | tee client.log ;\
kill $$(cat pid) ; )
profile: