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
79
	mv parts/test/coverage .
79
	mv parts/test/coverage .
6
80
80
7
81
.PHONY: coverage-reports-html
81
.PHONY: coverage-reports-html
9
82
coverage-reports-html coverage/reports: build
82
coverage-reports-html coverage/reports: coverage
10
83
	test -d parts/test/coverage && ! test -d coverage && mv parts/test/coverage . || true
83
	test -d parts/test/coverage && ! test -d coverage && mv parts/test/coverage . || true
11
84
	rm -rf coverage/reports
84
	rm -rf coverage/reports
12
85
	mkdir coverage/reports
85
	mkdir coverage/reports
13
@@ -94,7 +94,7 @@
14
94
	mv parts/test/ftest-coverage .
94
	mv parts/test/ftest-coverage .
15
95
95
16
96
.PHONY: ftest-coverage-reports-html
96
.PHONY: ftest-coverage-reports-html
18
97
ftest-coverage-reports-html ftest-coverage/reports: build
97
ftest-coverage-reports-html ftest-coverage/reports: ftest-coverage
19
98
	test -d parts/test/ftest-coverage && ! test -d ftest-coverage && mv parts/test/ftest-coverage . || true
98
	test -d parts/test/ftest-coverage && ! test -d ftest-coverage && mv parts/test/ftest-coverage . || true
20
99
	rm -rf ftest-coverage/reports
99
	rm -rf ftest-coverage/reports
21
100
	mkdir ftest-coverage/reports
100
	mkdir ftest-coverage/reports
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
SchoolTool Owners		2010-09-15	Pending
Review via email: mp+35499@code.launchpad.net
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	79	mv parts/test/coverage .	79	mv parts/test/coverage .
6	80		80
7	81	.PHONY: coverage-reports-html	81	.PHONY: coverage-reports-html
9	82	coverage-reports-html coverage/reports: build	82	coverage-reports-html coverage/reports: coverage
10	83	test -d parts/test/coverage && ! test -d coverage && mv parts/test/coverage . \|\| true	83	test -d parts/test/coverage && ! test -d coverage && mv parts/test/coverage . \|\| true
11	84	rm -rf coverage/reports	84	rm -rf coverage/reports
12	85	mkdir coverage/reports	85	mkdir coverage/reports
13	@@ -94,7 +94,7 @@
14	94	mv parts/test/ftest-coverage .	94	mv parts/test/ftest-coverage .
15	95		95
16	96	.PHONY: ftest-coverage-reports-html	96	.PHONY: ftest-coverage-reports-html
18	97	ftest-coverage-reports-html ftest-coverage/reports: build	97	ftest-coverage-reports-html ftest-coverage/reports: ftest-coverage
19	98	test -d parts/test/ftest-coverage && ! test -d ftest-coverage && mv parts/test/ftest-coverage . \|\| true	98	test -d parts/test/ftest-coverage && ! test -d ftest-coverage && mv parts/test/ftest-coverage . \|\| true
20	99	rm -rf ftest-coverage/reports	99	rm -rf ftest-coverage/reports
21	100	mkdir ftest-coverage/reports	100	mkdir ftest-coverage/reports