Merge lp:~dobey/ubuntuone-client/fix-test-fails into lp:ubuntuone-client

[dobey]

Fix the Makefile such that tests will fail properly again

[Mike McCracken (mikemc)]

My name is Mike McCracken, and I approve this merge request.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2012-04-27 20:38:13 +0000
+++ Makefile.am	2012-05-02 21:57:33 +0000
@@ -54,8 +54,8 @@
 test: logging.conf $(clientdefs_DATA) Makefile
 	echo "$(PYTHONPATH)"
 	if test "x$(builddir)" == "x$(srcdir)"; then \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i test_windows.py tests; \
-		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i test_windows.py tests/proxy; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i test_windows.py tests || exit 1; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i test_windows.py tests/proxy || exit 1; \
 	fi
 	rm -rf _trial_temp