@@ -252,12 +252,12 @@ test-reports: .env
252252test-reqs : cc-test-reporter test-reports init
253253 $(QUIET )$(PYTHON ) -m pip install $(PIP_COMMON_FLAGS ) $(PIP_ENV_FLAGS ) -r tests-requirements.txt 2> $(ERROR_LOG_PATH ) || true
254254
255- just-test : cleanup .env
255+ just-test : cleanup cc-test-reporter .env
256256 $(QUIET )$(COVERAGE ) run -p --source=pythonrepo -m unittest discover --verbose --buffer -s ./tests -t $(dir $(abspath $(lastword $(MAKEFILE_LIST ) ) ) ) || $(PYTHON ) -m unittest discover --verbose --buffer -s ./tests -t ./ || DO_FAIL=" exit 2" ;
257257 $(QUIET )$(WAIT ) ;
258258 $(QUIET )$(DO_FAIL ) ;
259259
260- test : just-test cc-test-reporter
260+ test : just-test
261261 $(QUIET )$(DO_FAIL ) ;
262262 $(QUIET )$(COVERAGE ) combine 2> $(ERROR_LOG_PATH ) || : ;
263263 $(QUIET )$(COVERAGE ) report -m --include=* 2> $(ERROR_LOG_PATH ) || : ;
@@ -270,8 +270,9 @@ test-tox: cleanup
270270
271271test-pytest : cleanup MANIFEST.in cc-test-reporter must_have_pytest test-reports
272272 $(QUIET )$(PYTHON ) -m pytest --cache-clear --doctest-glob=pythonrepo/* .py --doctest-modules --cov=. --cov-append --cov-report=xml --junitxml=test-reports/junit.xml -v --rootdir=. || DO_FAIL=" exit 2" ;
273- $(QUIET )$(DS_TOOL ) $(DS_TOOL_ARGS ) || : ;
274273 $(QUIET )$(CC_TOOL ) $(CC_TOOL_ARGS ) 2> $(ERROR_LOG_PATH ) || : ;
274+ $(QUIET )$(CA_TOOL ) $(CA_TOOL_ARGS ) || : ;
275+ $(QUIET )$(DS_TOOL ) $(DS_TOOL_ARGS ) || : ;
275276 $(QUIET )$(WAIT ) ;
276277 $(QUIET )$(DO_FAIL ) ;
277278 $(QUIET )$(ECHO ) " $@ : Done."
@@ -296,6 +297,9 @@ must_have_pytest: init
296297 $(QUIET ) runner=` $( PYTHON) -m pip freeze --all | grep --count -oF pytest` ; \
297298 if test $$ runner -le 0 ; then $( ECHO) " No python framework (pytest) found for test." ; exit 126 ; fi
298299
300+ cleanup-cc-test-reporter : $(FETCH_CC_INCLUDE_PATH )
301+ $(QUIET )$(CLEAN_CC_TOOL ) || :
302+
299303cleanup-dev-backups ::
300304 $(QUIET )$(RM ) ./* /* ~ 2> $(ERROR_LOG_PATH ) || :
301305 $(QUIET )$(RM ) ./.* /* ~ 2> $(ERROR_LOG_PATH ) || :
@@ -382,8 +386,7 @@ clean-docs: ./docs/ ./docs/Makefile
382386./docs/Makefile : ./docs/
383387 $(QUIET )$(WAIT ) ;
384388
385- clean : clean-docs cleanup
386- $(QUIET )$(ECHO ) " Cleaning Up."
389+ clean : clean-docs cleanup cleanup-cc-test-reporter
387390 $(QUIET )$(COVERAGE ) erase 2> $(ERROR_LOG_PATH ) || true
388391 $(QUIET )$(RM ) ./test-results/junit.xml 2> $(ERROR_LOG_PATH ) || true
389392 $(QUIET )$(RM ) ./MANIFEST.in 2> $(ERROR_LOG_PATH ) || true
0 commit comments