Merge lp:~replaceafill/schooltool.intervention/replaceafill_schooltool.intervention into lp:schooltool.intervention/0.5

Proposed by Douglas Cerna
Status: Merged
Merged at revision: 260
Proposed branch: lp:~replaceafill/schooltool.intervention/replaceafill_schooltool.intervention
Merge into: lp:schooltool.intervention/0.5
Diff against target: 21 lines (+2/-2)
1 file modified
Makefile (+2/-2)
To merge this branch: bzr merge lp:~replaceafill/schooltool.intervention/replaceafill_schooltool.intervention
Reviewer Review Type Date Requested Status
SchoolTool Owners Pending
Review via email: mp+35499@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2010-09-14 23:31:54 +0000
3+++ Makefile 2010-09-15 07:01:09 +0000
4@@ -79,7 +79,7 @@
5 mv parts/test/coverage .
6
7 .PHONY: coverage-reports-html
8-coverage-reports-html coverage/reports: build
9+coverage-reports-html coverage/reports: coverage
10 test -d parts/test/coverage && ! test -d coverage && mv parts/test/coverage . || true
11 rm -rf coverage/reports
12 mkdir coverage/reports
13@@ -94,7 +94,7 @@
14 mv parts/test/ftest-coverage .
15
16 .PHONY: ftest-coverage-reports-html
17-ftest-coverage-reports-html ftest-coverage/reports: build
18+ftest-coverage-reports-html ftest-coverage/reports: ftest-coverage
19 test -d parts/test/ftest-coverage && ! test -d ftest-coverage && mv parts/test/ftest-coverage . || true
20 rm -rf ftest-coverage/reports
21 mkdir ftest-coverage/reports

Subscribers

People subscribed via source and target branches