summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-12-13 12:30:53 +0000
committerMatthew Johnson <mjj29@hecate.trinhall.cam.ac.uk>2006-12-13 12:30:53 +0000
commite483628ed919b46f81fb5e34f30380b2dd29332b (patch)
tree80b53a390ae853499ab215385075001d0c19ff6f
parent5431ff5e30ff66c7b0cae3b5d6b42cebea021737 (diff)
make tests run better1.13
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 256fcbd..89f2e7c 100644
--- a/Makefile
+++ b/Makefile
@@ -167,8 +167,9 @@ cross-test-compile: libdbus-java.so libdbus-java-$(VERSION).jar dbus-java-test-$
internal-cross-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 cross-test-server > server.log &\
- $(MAKE) -s cross-test-client > client.log ;\
+ $(MAKE) -s cross-test-server | tee server.log &\
+ sleep 1;\
+ $(MAKE) -s cross-test-client | tee client.log ;\
kill $$(cat pid) ; )
two-part-test: libdbus-java.so libdbus-java-$(VERSION).jar dbus-java-test-$(VERSION).jar