PR#723: improve test and clean targets in Makefiles - koji

Yu Ming Zhu • 4 years ago

470d6c4

Yuming Zhu • 4 years ago

1508618

Yuming Zhu • 4 years ago

7bacb06

.coveragerc

file modified

.coveragerc3

file modified

		`@@ -1,8 +1,10 @@`
		`[run]`
		`+ data_file = .coverage3`

		`; extra omissions for py3 for now`

		`omit =`
		`+ setup.py`
		`/usr/*`
		`tests/*`

		`@@ -11,3 +13,6 @@`
		`pragma: no cover`
		`no cover 3.x`
		`if six.PY2`
		`+`
		`+ [html]`
		`+ directory = htmlcov/py3`

.gitignore

file modified

Makefile

file modified

+15 -5

		`@@ -61,29 +61,39 @@`

		`clean:`
		`rm -f .o .so .pyc ~ koji.bz2 koji.src.rpm`
		`+ rm -rf __pycache__`
		`+ rm -rf devtools/fakehubc devtools/fakewebc devtools/__pycache__`
		`rm -rf koji-$(VERSION)`
		`for d in $(SUBDIRS); do make -s -C $$d clean; done`
		`- coverage erase \|\|:`
		`+ find ./tests -name "__pycache__" -exec rm -rf {} \; \|\|:`
		`+ find ./tests -name "*.pyc" -exec rm -f {} \;`
		`+ rm -rf docs/source/__pycache__ docs/source/*.pyc`
		`+ coverage2 erase \|\|:`
		`+ coverage3 erase --rcfile .coveragerc3 \|\|:`
		`+ rm -rf htmlcov`

		`git-clean:`
		`@git clean -d -q -x`

		`- test:`
		`+ test: test2 test3`
		`+ @echo "All tests are finished for python 2&3"`
		`+`
		`+ test2:`
		`coverage2 erase`
		`PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/.:plugins/cli/.:cli/.:www/lib coverage2 run \`
		`--source . /usr/bin/nosetests`
		`coverage2 report`
		`coverage2 html`
		`- @echo Full coverage report at file://$(CURDIR)/htmlcov/index.html`
		`+ @echo Full coverage report at file://${CURDIR}/htmlcov/py2/index.html`

		`test3:`
		`- coverage3 erase`
		`+ coverage3 erase --rcfile .coveragerc3`
		`PYTHONPATH=hub/.:plugins/hub/.:plugins/builder/.:plugins/cli/.:cli/.:www/lib coverage3 run \`
		`--rcfile .coveragerc3 --source . \`
		`/usr/bin/nosetests-3`
		`coverage3 report --rcfile .coveragerc3`
		`coverage3 html --rcfile .coveragerc3`
		`- @echo Full coverage report at file://$(CURDIR)/htmlcov/index.html`
		`+ @echo Full coverage report at file://${CURDIR}/htmlcov/py3/index.html`

		`test-tarball:`
		`@rm -rf .koji-$(VERSION)`

builder/Makefile

file modified

cli/Makefile

file modified

		`@@ -13,6 +13,8 @@`

		`clean:`
		`rm -f .o .so .pyc ~ kojic`
		`+ rm -rf __pycache__`
		`+ for d in $(SUBDIRS); do make -s -C $$d clean; done`

		`install:`
		`@if [ "$(DESTDIR)" = "" ]; then \`

cli/koji_cli/Makefile

file modified

hub/Makefile

file modified

koji/Makefile

file modified

+1 -1

		`@@ -12,7 +12,7 @@`

		`clean:`
		`rm -f .o .so .pyc ~`
		`- for d in $(SUBDIRS); do make -s -C $$d clean; done`
		`+ rm -rf __pycache__`

		`install:`
		`mkdir -p $(DESTDIR)/$(PKGDIR)`

plugins/Makefile

file modified

+2 -1

		`@@ -21,7 +21,8 @@`
		`@echo "nothing to make. try make install"`

		`clean:`
		`- rm -f .o .so .pyc .pyo *~`
		`+ find . -name "__pycache__" -exec rm -rf {} \; \|\|:`
		`+ find . -name "*.pyc" -exec rm -f {} \;`

		`install:`
		`@if [ "$(DESTDIR)" = "" ]; then \`

runtests

file modified

+3 -3

		`@@ -26,8 +26,8 @@`
		`return output`


		`- def run_test():`
		`- return checkout_run(['make', 'test'])`
		`+ def run_test2():`
		`+ return checkout_run(['make', 'test2'])`


		`def run_test3():`
		`@@ -38,7 +38,7 @@`
		`"""Run our test targets in parallel using fresh checkouts of HEAD"""`
		`print("Running tests...")`
		`p = Pool(2)`
		`- results = [p.apply_async(f) for f in [run_test, run_test3]]`
		`+ results = [p.apply_async(f) for f in [run_test2, run_test3]]`
		`for r in results:`
		`print(r.get().decode('utf-8'))`
		`p.close()`