Ubuntu One Client

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

  1. fix-test-fails-3-0
  2. Merge into stable-3-0
Proposed by dobey on 2012-05-16
Status: Merged
Approved by: Roberto Alsina on 2012-05-17
Approved revision: 1187
Merged at revision: 1189
Proposed branch: lp:~dobey/ubuntuone-client/fix-test-fails-3-0
Merge into: lp:ubuntuone-client/stable-3-0
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-3-0
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-05-16 Approve on 2012-05-17
Review via email: mp+106062@code.launchpad.net

Commit Message

Fix the Makefile such that tests will fail properly again

To post a comment you must log in.
Ubuntu One Auto Pilot (otto-pilot) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

Roberto Alsina (ralsina) :
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-11 00:52:01 +0000
3+++ Makefile.am 2012-05-16 22:04:18 +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 tests; \
9- PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows tests/proxy; \
10+ PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy tests || exit 1; \
11+ PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows tests/proxy || exit 1; \
12 fi
13 rm -rf _trial_temp
14

Subscribers

People subscribed via source and target branches

to all changes: