diff --git a/run.py b/run.py index a49fb47..7ea73ff 100644 --- a/run.py +++ b/run.py @@ -26,14 +26,6 @@ except ImportError: import shutil -ARG_CLEAN = 'clean' -ARG_RUN = 'run' -ARG_FINALISE = 'finalise' -ARG_TEX = 'tex' -ARG_STATUS = 'status' -ARG_COPY = 'copy' -ARG_RELEASE = 'release' - FN_DATA_COLLECTION = 'unittest.json' FN_TEX_REPORT = 'unittest.tex' FN_PDF_REPORT = 'unittest.pdf' @@ -161,8 +153,6 @@ class coverage_info(list): def unittest(options, args, unittest_folder): if 'release_testcases' in args: unittest_release_testcases(unittest_folder) - elif 'clean' in args: - unittest_clean(unittest_folder) elif 'prepare' in args: unittest_prepare(unittest_folder) elif 'testrun' in args: @@ -190,13 +180,6 @@ def unittest_release_testcases(ut_folder): fh.write(line + '\n') -def unittest_clean(ut_folder): - output.print_header('Cleaning up...') - output.print_action('Testresults from last testrun') - for fn in os.listdir(testresults_filename(ut_folder, '')): - remove_file(testresults_filename(ut_folder, fn)) - - def unittest_prepare(ut_folder): config = imp.load_source('', jsonlog.get_ut_config(ut_folder)) # diff --git a/scripts/Makefile b/scripts/Makefile index ddaa7f5..3a1283d 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -34,7 +34,10 @@ smoke: testrun_smoke finalise compile status single: testrun_single finalise compile status clean: - @$(PYT3_CMD) src/unittest/scripts/unittest.py clean + @echo "\033[1;33mCleaning up...\e[0m" + @echo "\e[1m * Testresults from last testrunx\e[0m" + @ls testresults | xargs -i echo " testresults/{}" + @ls testresults | xargs -i rm -f "testresults/{}" @echo "\e[1m * Collected coverage information\e[0m" @$(COV3_CMD) erase