Ubuntu One Client

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

  1. fix-test-fails
  2. Merge into trunk
Proposed by dobey on 2012-05-02
Status: Merged
Approved by: dobey on 2012-05-02
Approved revision: 1237
Merged at revision: 1238
Proposed branch: lp:~dobey/ubuntuone-client/fix-test-fails
Merge into: lp:ubuntuone-client
Diff against target: 13 lines (+2/-2)
1 file modified
Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/fix-test-fails
Reviewer Review Type Date Requested Status
Mike McCracken (community) 2012-05-02 Approve on 2012-05-02
Review via email: mp+104463@code.launchpad.net

Commit Message

Fix the Makefile such that tests will fail properly again

To post a comment you must log in.
Mike McCracken (mikemc) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2012-04-27 20:38:13 +0000
3+++ Makefile.am 2012-05-02 21:57:33 +0000
4@@ -54,8 +54,8 @@
5 test: logging.conf $(clientdefs_DATA) Makefile
6 echo "$(PYTHONPATH)"
7 if test "x$(builddir)" == "x$(srcdir)"; then \
8- PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i test_windows.py tests; \
9- PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i test_windows.py tests/proxy; \
10+ PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i test_windows.py tests || exit 1; \
11+ PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i test_windows.py tests/proxy || exit 1; \
12 fi
13 rm -rf _trial_temp
14

Subscribers

People subscribed via source and target branches