@@ -252,12 +252,12 @@ test-reports: .env
252
252
test-reqs : cc-test-reporter test-reports init
253
253
$(QUIET )$(PYTHON ) -m pip install $(PIP_COMMON_FLAGS ) $(PIP_ENV_FLAGS ) -r tests-requirements.txt 2> $(ERROR_LOG_PATH ) || true
254
254
255
- just-test : cleanup .env
255
+ just-test : cleanup cc-test-reporter .env
256
256
$(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" ;
257
257
$(QUIET )$(WAIT ) ;
258
258
$(QUIET )$(DO_FAIL ) ;
259
259
260
- test : just-test cc-test-reporter
260
+ test : just-test
261
261
$(QUIET )$(DO_FAIL ) ;
262
262
$(QUIET )$(COVERAGE ) combine 2> $(ERROR_LOG_PATH ) || : ;
263
263
$(QUIET )$(COVERAGE ) report -m --include=* 2> $(ERROR_LOG_PATH ) || : ;
@@ -270,8 +270,9 @@ test-tox: cleanup
270
270
271
271
test-pytest : cleanup MANIFEST.in cc-test-reporter must_have_pytest test-reports
272
272
$(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 ) || : ;
274
273
$(QUIET )$(CC_TOOL ) $(CC_TOOL_ARGS ) 2> $(ERROR_LOG_PATH ) || : ;
274
+ $(QUIET )$(CA_TOOL ) $(CA_TOOL_ARGS ) || : ;
275
+ $(QUIET )$(DS_TOOL ) $(DS_TOOL_ARGS ) || : ;
275
276
$(QUIET )$(WAIT ) ;
276
277
$(QUIET )$(DO_FAIL ) ;
277
278
$(QUIET )$(ECHO ) " $@ : Done."
@@ -296,6 +297,9 @@ must_have_pytest: init
296
297
$(QUIET ) runner=` $( PYTHON) -m pip freeze --all | grep --count -oF pytest` ; \
297
298
if test $$ runner -le 0 ; then $( ECHO) " No python framework (pytest) found for test." ; exit 126 ; fi
298
299
300
+ cleanup-cc-test-reporter : $(FETCH_CC_INCLUDE_PATH )
301
+ $(QUIET )$(CLEAN_CC_TOOL ) || :
302
+
299
303
cleanup-dev-backups ::
300
304
$(QUIET )$(RM ) ./* /* ~ 2> $(ERROR_LOG_PATH ) || :
301
305
$(QUIET )$(RM ) ./.* /* ~ 2> $(ERROR_LOG_PATH ) || :
@@ -382,8 +386,7 @@ clean-docs: ./docs/ ./docs/Makefile
382
386
./docs/Makefile : ./docs/
383
387
$(QUIET )$(WAIT ) ;
384
388
385
- clean : clean-docs cleanup
386
- $(QUIET )$(ECHO ) " Cleaning Up."
389
+ clean : clean-docs cleanup cleanup-cc-test-reporter
387
390
$(QUIET )$(COVERAGE ) erase 2> $(ERROR_LOG_PATH ) || true
388
391
$(QUIET )$(RM ) ./test-results/junit.xml 2> $(ERROR_LOG_PATH ) || true
389
392
$(QUIET )$(RM ) ./MANIFEST.in 2> $(ERROR_LOG_PATH ) || true
0 commit comments