From ddd60a38ac3e716c1d4d357cb1c39a5e2482610e Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Sun, 29 Jan 2023 21:29:19 +0100 Subject: [PATCH] coverage --- .coveragerc | 1 - scripts/check-tests-ng.sh | 14 +++----------- scripts/check-unittests.sh | 17 ++--------------- tests-ng/actions-args-template.sh | 2 +- tests-ng/actions-args.sh | 2 +- tests-ng/actions-default.sh | 2 +- tests-ng/actions-empty-dir.sh | 2 +- tests-ng/actions-pre.sh | 2 +- tests-ng/actions-template.sh | 2 +- tests-ng/actions.sh | 2 +- tests-ng/bad-diff-cmd.sh | 2 +- tests-ng/chmod-compare.sh | 2 +- tests-ng/chmod-import.sh | 2 +- tests-ng/chmod-install.sh | 2 +- tests-ng/chmod-more.sh | 2 +- tests-ng/chmod-preserve-install.sh | 2 +- tests-ng/chmod-preserve-update.sh | 2 +- tests-ng/chmod-update.sh | 2 +- tests-ng/clear-workdir.sh | 2 +- tests-ng/compare-ignore-missing.sh | 2 +- tests-ng/compare-ignore-relative.sh | 2 +- tests-ng/compare-ignore.sh | 2 +- tests-ng/compare-include.sh | 2 +- tests-ng/compare-negative-ignore-relative.sh | 2 +- tests-ng/compare-profile-check.sh | 2 +- tests-ng/compare.sh | 2 +- tests-ng/corner-case.sh | 2 +- tests-ng/deprecated-link.sh | 2 +- tests-ng/diff-cmd.sh | 2 +- tests-ng/dir-import-update.sh | 2 +- tests-ng/dotdrop-variables.sh | 2 +- tests-ng/dotfile-no-src.sh | 2 +- tests-ng/dotfile-sub-variables.sh | 2 +- tests-ng/dotfile-variables.sh | 2 +- tests-ng/dotfiles-all.sh | 2 +- tests-ng/dotfiles-dyn-paths.sh | 2 +- tests-ng/double-config-import.sh | 2 +- tests-ng/dry.sh | 2 +- tests-ng/duplicate-key.sh | 2 +- tests-ng/dynactions.sh | 2 +- tests-ng/dyndotfilepaths.sh | 2 +- tests-ng/dynextvariables.sh | 2 +- tests-ng/dyninclude.sh | 2 +- tests-ng/dynvariables.sh | 2 +- tests-ng/env.sh | 2 +- tests-ng/ext-actions.sh | 2 +- tests-ng/extvariables.sh | 2 +- tests-ng/filter_file.sh | 2 +- tests-ng/force-actions.sh | 2 +- tests-ng/func_file.sh | 2 +- tests-ng/global-compare-ignore.sh | 2 +- tests-ng/global-compare-negative-ignore.sh | 2 +- tests-ng/global-update-ignore.sh | 2 +- tests-ng/global-update-negative-ignore.sh | 2 +- tests-ng/globs.sh | 2 +- tests-ng/header.sh | 2 +- tests-ng/ignore-empty.sh | 2 +- tests-ng/import-as.sh | 2 +- tests-ng/import-configs.sh | 2 +- tests-ng/import-configs2.sh | 2 +- tests-ng/import-duplicate.sh | 2 +- tests-ng/import-ignore.sh | 2 +- tests-ng/import-include.sh | 2 +- tests-ng/import-link-children.sh | 2 +- tests-ng/import-negative-ignore.sh | 2 +- tests-ng/import-non-existing.sh | 2 +- tests-ng/import-profile-dotfiles.sh | 2 +- tests-ng/import-subfile.sh | 2 +- tests-ng/import-to-no-profile.sh | 2 +- tests-ng/import-with-empty.sh | 2 +- tests-ng/import-with-trans.sh | 2 +- tests-ng/import.sh | 2 +- tests-ng/imported-configs-variables.sh | 2 +- tests-ng/imported-variables-from-config.sh | 2 +- tests-ng/include-actions.sh | 2 +- tests-ng/include-order.sh | 2 +- tests-ng/include-variables.sh | 2 +- tests-ng/include.sh | 2 +- tests-ng/inst-link-default.sh | 2 +- tests-ng/install-empty.sh | 2 +- tests-ng/install-ignore.sh | 2 +- tests-ng/install-link-children.sh | 2 +- tests-ng/install-negative-ignore.sh | 2 +- tests-ng/install-to-temp.sh | 2 +- tests-ng/install.sh | 2 +- tests-ng/jhelpers.sh | 2 +- tests-ng/key-prefix-sep.sh | 2 +- tests-ng/link-import-default.sh | 2 +- tests-ng/link-templates-dir-home.sh | 2 +- tests-ng/link-templates-dir.sh | 2 +- tests-ng/link-templates.sh | 2 +- tests-ng/link-value-tests.sh | 2 +- tests-ng/macro-with-globals.sh | 2 +- tests-ng/minversion.sh | 2 +- tests-ng/negative-ignore-no-match.sh | 2 +- tests-ng/notemplate.sh | 2 +- tests-ng/profile-actions.sh | 2 +- tests-ng/profile-dyninclude.sh | 2 +- tests-ng/profile-dynvariables.sh | 2 +- tests-ng/profile-import-dotfiles.sh | 2 +- tests-ng/profile-undefined-variables.sh | 2 +- tests-ng/re-import.sh | 2 +- tests-ng/recinclude.sh | 2 +- tests-ng/recvariables.sh | 2 +- tests-ng/remove.sh | 2 +- tests-ng/symlink-relative.sh | 2 +- tests-ng/symlink.sh | 2 +- tests-ng/template-dotpath.sh | 2 +- tests-ng/template-link-value.sh | 2 +- tests-ng/toml.sh | 2 +- tests-ng/transformations-template.sh | 2 +- tests-ng/transformations-with-args.sh | 2 +- tests-ng/transformations.sh | 2 +- tests-ng/update-ignore-missing.sh | 2 +- tests-ng/update-ignore-relative.sh | 2 +- tests-ng/update-ignore.sh | 2 +- tests-ng/update-negative-ignore-relative.sh | 2 +- tests-ng/update-negative-ignore.sh | 2 +- tests-ng/update-profile-check.sh | 2 +- tests-ng/update-rights.sh | 2 +- tests-ng/update-templates.sh | 2 +- tests-ng/update-with-key.sh | 2 +- tests-ng/update.sh | 2 +- tests-ng/uservariables.sh | 2 +- tests-ng/variables-enrich.sh | 2 +- tests-ng/variables-include.sh | 2 +- tests-ng/variables.sh | 2 +- tests-ng/workdir-compare.sh | 2 +- tests-ng/workdir.sh | 2 +- tests-requirements.txt | 2 +- tests.sh | 3 +++ 131 files changed, 135 insertions(+), 154 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index cd9ebe8..0000000 --- a/.coveragerc +++ /dev/null @@ -1 +0,0 @@ -[run] parallel=True diff --git a/scripts/check-tests-ng.sh b/scripts/check-tests-ng.sh index 5d46681..240510f 100755 --- a/scripts/check-tests-ng.sh +++ b/scripts/check-tests-ng.sh @@ -18,24 +18,16 @@ cur=$(dirname "$(${rl} "${0}")") tmpworkdir="/tmp/dotdrop-tests-workdir" export DOTDROP_WORKDIR="${tmpworkdir}" -workers=${DOTDROP_WORKERS} -if [ -n "${workers}" ]; then - DOTDROP_WORKERS=${workers} - echo "ENABLE workers: ${workers}" -fi - -# run bash tests -export DOTDROP_DEBUG="yes" -unset DOTDROP_FORCE_NODEBUG +# check if tmp dir is present workdir_tmp_exists="no" [ -d "${HOME}/.config/dotdrop/tmp" ] && workdir_tmp_exists="yes" + +# run bash tests if [ -z "${GITHUB_WORKFLOW}" ]; then ## local - export COVERAGE_FILE= tests-ng/tests_launcher.py else ## CI/CD - export COVERAGE_FILE="${cur}/.coverage" # running multiple jobs in parallel sometimes # messes with the results on remote servers tests-ng/tests_launcher.py 1 diff --git a/scripts/check-unittests.sh b/scripts/check-unittests.sh index f942420..79af357 100755 --- a/scripts/check-unittests.sh +++ b/scripts/check-unittests.sh @@ -17,20 +17,7 @@ cur=$(dirname "$(${rl} "${0}")") if [ -n "${DOTDROP_WORKERS}" ]; then unset DOTDROP_WORKERS - echo "DISABLE workers" + echo "DISABLE workers for unittests" fi -# execute tests with coverage -if [ -z "${GITHUB_WORKFLOW}" ]; then - ## local - export COVERAGE_FILE= - # do not print debugs when running tests (faster) - # tests - PYTHONPATH="dotdrop" nose2 --with-coverage --coverage dotdrop --plugin=nose2.plugins.mp -N0 -else - ## CI/CD - export COVERAGE_FILE="${cur}/.coverage" - # tests - PYTHONPATH="dotdrop" nose2 --with-coverage --coverage dotdrop -fi -#PYTHONPATH="dotdrop" python3 -m pytest tests \ No newline at end of file +coverage run -p -m pytest tests \ No newline at end of file diff --git a/tests-ng/actions-args-template.sh b/tests-ng/actions-args-template.sh index 0e9a003..877ef43 100755 --- a/tests-ng/actions-args-template.sh +++ b/tests-ng/actions-args-template.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/actions-args.sh b/tests-ng/actions-args.sh index 55b12a4..157a576 100755 --- a/tests-ng/actions-args.sh +++ b/tests-ng/actions-args.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/actions-default.sh b/tests-ng/actions-default.sh index 4e761d7..3228de3 100755 --- a/tests-ng/actions-default.sh +++ b/tests-ng/actions-default.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/actions-empty-dir.sh b/tests-ng/actions-empty-dir.sh index 3c89cd0..6821a1f 100755 --- a/tests-ng/actions-empty-dir.sh +++ b/tests-ng/actions-empty-dir.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/actions-pre.sh b/tests-ng/actions-pre.sh index 65dd112..c89ee7a 100755 --- a/tests-ng/actions-pre.sh +++ b/tests-ng/actions-pre.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/actions-template.sh b/tests-ng/actions-template.sh index ddc0bd2..09369f3 100755 --- a/tests-ng/actions-template.sh +++ b/tests-ng/actions-template.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/actions.sh b/tests-ng/actions.sh index 1a84022..f3c40f3 100755 --- a/tests-ng/actions.sh +++ b/tests-ng/actions.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/bad-diff-cmd.sh b/tests-ng/bad-diff-cmd.sh index 9a268f7..134b9e9 100755 --- a/tests-ng/bad-diff-cmd.sh +++ b/tests-ng/bad-diff-cmd.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/chmod-compare.sh b/tests-ng/chmod-compare.sh index 597c90a..41ed3af 100755 --- a/tests-ng/chmod-compare.sh +++ b/tests-ng/chmod-compare.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/chmod-import.sh b/tests-ng/chmod-import.sh index b891794..ebc7fee 100755 --- a/tests-ng/chmod-import.sh +++ b/tests-ng/chmod-import.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/chmod-install.sh b/tests-ng/chmod-install.sh index 8075adc..f22a16c 100755 --- a/tests-ng/chmod-install.sh +++ b/tests-ng/chmod-install.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/chmod-more.sh b/tests-ng/chmod-more.sh index 614e203..7988b15 100755 --- a/tests-ng/chmod-more.sh +++ b/tests-ng/chmod-more.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/chmod-preserve-install.sh b/tests-ng/chmod-preserve-install.sh index 75b822c..7d2064b 100755 --- a/tests-ng/chmod-preserve-install.sh +++ b/tests-ng/chmod-preserve-install.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/chmod-preserve-update.sh b/tests-ng/chmod-preserve-update.sh index 8b0a413..9d00c2d 100755 --- a/tests-ng/chmod-preserve-update.sh +++ b/tests-ng/chmod-preserve-update.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/chmod-update.sh b/tests-ng/chmod-update.sh index cff2bbd..54fbdae 100755 --- a/tests-ng/chmod-update.sh +++ b/tests-ng/chmod-update.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/clear-workdir.sh b/tests-ng/clear-workdir.sh index add60da..f17587e 100755 --- a/tests-ng/clear-workdir.sh +++ b/tests-ng/clear-workdir.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/compare-ignore-missing.sh b/tests-ng/compare-ignore-missing.sh index ff0c09c..f68a759 100755 --- a/tests-ng/compare-ignore-missing.sh +++ b/tests-ng/compare-ignore-missing.sh @@ -28,7 +28,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/compare-ignore-relative.sh b/tests-ng/compare-ignore-relative.sh index 76df05d..787828d 100755 --- a/tests-ng/compare-ignore-relative.sh +++ b/tests-ng/compare-ignore-relative.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/compare-ignore.sh b/tests-ng/compare-ignore.sh index 5fb7487..4380ba1 100755 --- a/tests-ng/compare-ignore.sh +++ b/tests-ng/compare-ignore.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/compare-include.sh b/tests-ng/compare-include.sh index 718acbe..e854735 100755 --- a/tests-ng/compare-include.sh +++ b/tests-ng/compare-include.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/compare-negative-ignore-relative.sh b/tests-ng/compare-negative-ignore-relative.sh index 5502a06..4d29fde 100755 --- a/tests-ng/compare-negative-ignore-relative.sh +++ b/tests-ng/compare-negative-ignore-relative.sh @@ -27,7 +27,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/compare-profile-check.sh b/tests-ng/compare-profile-check.sh index 89594cd..21b957b 100755 --- a/tests-ng/compare-profile-check.sh +++ b/tests-ng/compare-profile-check.sh @@ -28,7 +28,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/compare.sh b/tests-ng/compare.sh index 7a825f4..410516e 100755 --- a/tests-ng/compare.sh +++ b/tests-ng/compare.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/corner-case.sh b/tests-ng/corner-case.sh index ede959b..d9e068b 100755 --- a/tests-ng/corner-case.sh +++ b/tests-ng/corner-case.sh @@ -38,7 +38,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/deprecated-link.sh b/tests-ng/deprecated-link.sh index 74d8ebc..f071699 100755 --- a/tests-ng/deprecated-link.sh +++ b/tests-ng/deprecated-link.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/diff-cmd.sh b/tests-ng/diff-cmd.sh index 0ad99a9..ebb6bca 100755 --- a/tests-ng/diff-cmd.sh +++ b/tests-ng/diff-cmd.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dir-import-update.sh b/tests-ng/dir-import-update.sh index c81fdc8..7e58dbb 100755 --- a/tests-ng/dir-import-update.sh +++ b/tests-ng/dir-import-update.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dotdrop-variables.sh b/tests-ng/dotdrop-variables.sh index 6d9f3e4..86dc77f 100755 --- a/tests-ng/dotdrop-variables.sh +++ b/tests-ng/dotdrop-variables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dotfile-no-src.sh b/tests-ng/dotfile-no-src.sh index 63bc47e..73b9853 100755 --- a/tests-ng/dotfile-no-src.sh +++ b/tests-ng/dotfile-no-src.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dotfile-sub-variables.sh b/tests-ng/dotfile-sub-variables.sh index 27ee428..5256905 100755 --- a/tests-ng/dotfile-sub-variables.sh +++ b/tests-ng/dotfile-sub-variables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dotfile-variables.sh b/tests-ng/dotfile-variables.sh index 125798c..48a6c52 100755 --- a/tests-ng/dotfile-variables.sh +++ b/tests-ng/dotfile-variables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dotfiles-all.sh b/tests-ng/dotfiles-all.sh index 238b3fe..a67f89c 100755 --- a/tests-ng/dotfiles-all.sh +++ b/tests-ng/dotfiles-all.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dotfiles-dyn-paths.sh b/tests-ng/dotfiles-dyn-paths.sh index cd7a551..a909540 100755 --- a/tests-ng/dotfiles-dyn-paths.sh +++ b/tests-ng/dotfiles-dyn-paths.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/double-config-import.sh b/tests-ng/double-config-import.sh index 650a814..f959ac0 100755 --- a/tests-ng/double-config-import.sh +++ b/tests-ng/double-config-import.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dry.sh b/tests-ng/dry.sh index 47dbad5..18b86dd 100755 --- a/tests-ng/dry.sh +++ b/tests-ng/dry.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/duplicate-key.sh b/tests-ng/duplicate-key.sh index dede032..777b99f 100755 --- a/tests-ng/duplicate-key.sh +++ b/tests-ng/duplicate-key.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dynactions.sh b/tests-ng/dynactions.sh index 973a27d..0df19ad 100755 --- a/tests-ng/dynactions.sh +++ b/tests-ng/dynactions.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dyndotfilepaths.sh b/tests-ng/dyndotfilepaths.sh index db38dab..4fe774b 100755 --- a/tests-ng/dyndotfilepaths.sh +++ b/tests-ng/dyndotfilepaths.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dynextvariables.sh b/tests-ng/dynextvariables.sh index 4c8846f..99843ea 100755 --- a/tests-ng/dynextvariables.sh +++ b/tests-ng/dynextvariables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dyninclude.sh b/tests-ng/dyninclude.sh index 5758f27..52ff5c5 100755 --- a/tests-ng/dyninclude.sh +++ b/tests-ng/dyninclude.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/dynvariables.sh b/tests-ng/dynvariables.sh index c537c4f..17b7e0e 100755 --- a/tests-ng/dynvariables.sh +++ b/tests-ng/dynvariables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/env.sh b/tests-ng/env.sh index 790b400..f1c4b8c 100755 --- a/tests-ng/env.sh +++ b/tests-ng/env.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/ext-actions.sh b/tests-ng/ext-actions.sh index d4f914e..8124ec6 100755 --- a/tests-ng/ext-actions.sh +++ b/tests-ng/ext-actions.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/extvariables.sh b/tests-ng/extvariables.sh index 7324f93..e0481ea 100755 --- a/tests-ng/extvariables.sh +++ b/tests-ng/extvariables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/filter_file.sh b/tests-ng/filter_file.sh index 38479de..68b5986 100755 --- a/tests-ng/filter_file.sh +++ b/tests-ng/filter_file.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/force-actions.sh b/tests-ng/force-actions.sh index c293bb0..001dfd5 100755 --- a/tests-ng/force-actions.sh +++ b/tests-ng/force-actions.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/func_file.sh b/tests-ng/func_file.sh index d1b2afc..5467cf3 100755 --- a/tests-ng/func_file.sh +++ b/tests-ng/func_file.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/global-compare-ignore.sh b/tests-ng/global-compare-ignore.sh index 05e2a21..8efab50 100755 --- a/tests-ng/global-compare-ignore.sh +++ b/tests-ng/global-compare-ignore.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/global-compare-negative-ignore.sh b/tests-ng/global-compare-negative-ignore.sh index c5fef6d..33916c5 100755 --- a/tests-ng/global-compare-negative-ignore.sh +++ b/tests-ng/global-compare-negative-ignore.sh @@ -27,7 +27,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/global-update-ignore.sh b/tests-ng/global-update-ignore.sh index efd758d..f3ba4d2 100755 --- a/tests-ng/global-update-ignore.sh +++ b/tests-ng/global-update-ignore.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/global-update-negative-ignore.sh b/tests-ng/global-update-negative-ignore.sh index faee38c..4bb44cf 100755 --- a/tests-ng/global-update-negative-ignore.sh +++ b/tests-ng/global-update-negative-ignore.sh @@ -27,7 +27,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/globs.sh b/tests-ng/globs.sh index ee5d0ec..034a650 100755 --- a/tests-ng/globs.sh +++ b/tests-ng/globs.sh @@ -36,7 +36,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/header.sh b/tests-ng/header.sh index e51e6ec..d60c5c5 100755 --- a/tests-ng/header.sh +++ b/tests-ng/header.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/ignore-empty.sh b/tests-ng/ignore-empty.sh index b3d2431..45b09a6 100755 --- a/tests-ng/ignore-empty.sh +++ b/tests-ng/ignore-empty.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-as.sh b/tests-ng/import-as.sh index 2ea3f29..308e6aa 100755 --- a/tests-ng/import-as.sh +++ b/tests-ng/import-as.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-configs.sh b/tests-ng/import-configs.sh index e729240..b4080e9 100755 --- a/tests-ng/import-configs.sh +++ b/tests-ng/import-configs.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-configs2.sh b/tests-ng/import-configs2.sh index b3845e9..dfb8fb9 100755 --- a/tests-ng/import-configs2.sh +++ b/tests-ng/import-configs2.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-duplicate.sh b/tests-ng/import-duplicate.sh index 6358ace..919d65a 100755 --- a/tests-ng/import-duplicate.sh +++ b/tests-ng/import-duplicate.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-ignore.sh b/tests-ng/import-ignore.sh index c9ac538..82e68f9 100755 --- a/tests-ng/import-ignore.sh +++ b/tests-ng/import-ignore.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-include.sh b/tests-ng/import-include.sh index 848b5e1..d0015ac 100755 --- a/tests-ng/import-include.sh +++ b/tests-ng/import-include.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-link-children.sh b/tests-ng/import-link-children.sh index 5158462..ecd40ff 100755 --- a/tests-ng/import-link-children.sh +++ b/tests-ng/import-link-children.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-negative-ignore.sh b/tests-ng/import-negative-ignore.sh index 00ed4fc..2086739 100755 --- a/tests-ng/import-negative-ignore.sh +++ b/tests-ng/import-negative-ignore.sh @@ -27,7 +27,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-non-existing.sh b/tests-ng/import-non-existing.sh index 7868445..a4d227c 100755 --- a/tests-ng/import-non-existing.sh +++ b/tests-ng/import-non-existing.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-profile-dotfiles.sh b/tests-ng/import-profile-dotfiles.sh index d97c8fc..ceef938 100755 --- a/tests-ng/import-profile-dotfiles.sh +++ b/tests-ng/import-profile-dotfiles.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-subfile.sh b/tests-ng/import-subfile.sh index 503591e..9b10568 100755 --- a/tests-ng/import-subfile.sh +++ b/tests-ng/import-subfile.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-to-no-profile.sh b/tests-ng/import-to-no-profile.sh index e497fa8..a959f42 100755 --- a/tests-ng/import-to-no-profile.sh +++ b/tests-ng/import-to-no-profile.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-with-empty.sh b/tests-ng/import-with-empty.sh index c0abee3..0f33bed 100755 --- a/tests-ng/import-with-empty.sh +++ b/tests-ng/import-with-empty.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import-with-trans.sh b/tests-ng/import-with-trans.sh index ef9a1c2..387d074 100755 --- a/tests-ng/import-with-trans.sh +++ b/tests-ng/import-with-trans.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/import.sh b/tests-ng/import.sh index c4a70fa..d16d32e 100755 --- a/tests-ng/import.sh +++ b/tests-ng/import.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/imported-configs-variables.sh b/tests-ng/imported-configs-variables.sh index b89d340..cf16d45 100755 --- a/tests-ng/imported-configs-variables.sh +++ b/tests-ng/imported-configs-variables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/imported-variables-from-config.sh b/tests-ng/imported-variables-from-config.sh index c29fae8..92f334a 100755 --- a/tests-ng/imported-variables-from-config.sh +++ b/tests-ng/imported-variables-from-config.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/include-actions.sh b/tests-ng/include-actions.sh index 42d077d..13f683e 100755 --- a/tests-ng/include-actions.sh +++ b/tests-ng/include-actions.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/include-order.sh b/tests-ng/include-order.sh index 69400d4..923bda5 100755 --- a/tests-ng/include-order.sh +++ b/tests-ng/include-order.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/include-variables.sh b/tests-ng/include-variables.sh index a6df34e..35f8aed 100755 --- a/tests-ng/include-variables.sh +++ b/tests-ng/include-variables.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/include.sh b/tests-ng/include.sh index 0068fdb..93e6212 100755 --- a/tests-ng/include.sh +++ b/tests-ng/include.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/inst-link-default.sh b/tests-ng/inst-link-default.sh index eb0628f..63c11dc 100755 --- a/tests-ng/inst-link-default.sh +++ b/tests-ng/inst-link-default.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/install-empty.sh b/tests-ng/install-empty.sh index 377789a..3fdfcde 100755 --- a/tests-ng/install-empty.sh +++ b/tests-ng/install-empty.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/install-ignore.sh b/tests-ng/install-ignore.sh index 0eacf36..8f876c3 100755 --- a/tests-ng/install-ignore.sh +++ b/tests-ng/install-ignore.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/install-link-children.sh b/tests-ng/install-link-children.sh index 3b3bc51..dd0c19a 100755 --- a/tests-ng/install-link-children.sh +++ b/tests-ng/install-link-children.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/install-negative-ignore.sh b/tests-ng/install-negative-ignore.sh index 094e39c..c45543d 100755 --- a/tests-ng/install-negative-ignore.sh +++ b/tests-ng/install-negative-ignore.sh @@ -27,7 +27,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/install-to-temp.sh b/tests-ng/install-to-temp.sh index bd86ced..ba65816 100755 --- a/tests-ng/install-to-temp.sh +++ b/tests-ng/install-to-temp.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/install.sh b/tests-ng/install.sh index c832e8d..1b24cfe 100755 --- a/tests-ng/install.sh +++ b/tests-ng/install.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/jhelpers.sh b/tests-ng/jhelpers.sh index df15fa1..e89b08c 100755 --- a/tests-ng/jhelpers.sh +++ b/tests-ng/jhelpers.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/key-prefix-sep.sh b/tests-ng/key-prefix-sep.sh index 8528a3b..e92fd35 100755 --- a/tests-ng/key-prefix-sep.sh +++ b/tests-ng/key-prefix-sep.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/link-import-default.sh b/tests-ng/link-import-default.sh index 3e5ba52..3c33cbf 100755 --- a/tests-ng/link-import-default.sh +++ b/tests-ng/link-import-default.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/link-templates-dir-home.sh b/tests-ng/link-templates-dir-home.sh index b6ec873..825079f 100755 --- a/tests-ng/link-templates-dir-home.sh +++ b/tests-ng/link-templates-dir-home.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/link-templates-dir.sh b/tests-ng/link-templates-dir.sh index 239ef62..debbe82 100755 --- a/tests-ng/link-templates-dir.sh +++ b/tests-ng/link-templates-dir.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/link-templates.sh b/tests-ng/link-templates.sh index 0fb5723..29142f6 100755 --- a/tests-ng/link-templates.sh +++ b/tests-ng/link-templates.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/link-value-tests.sh b/tests-ng/link-value-tests.sh index e923a17..6e3b9d9 100755 --- a/tests-ng/link-value-tests.sh +++ b/tests-ng/link-value-tests.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/macro-with-globals.sh b/tests-ng/macro-with-globals.sh index 2c015c2..2a9a864 100755 --- a/tests-ng/macro-with-globals.sh +++ b/tests-ng/macro-with-globals.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/minversion.sh b/tests-ng/minversion.sh index 2376b96..b7431cc 100755 --- a/tests-ng/minversion.sh +++ b/tests-ng/minversion.sh @@ -31,7 +31,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/negative-ignore-no-match.sh b/tests-ng/negative-ignore-no-match.sh index 935a2bf..439341f 100755 --- a/tests-ng/negative-ignore-no-match.sh +++ b/tests-ng/negative-ignore-no-match.sh @@ -27,7 +27,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/notemplate.sh b/tests-ng/notemplate.sh index dcebec0..dee37fb 100755 --- a/tests-ng/notemplate.sh +++ b/tests-ng/notemplate.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/profile-actions.sh b/tests-ng/profile-actions.sh index 46e532e..ee157d8 100755 --- a/tests-ng/profile-actions.sh +++ b/tests-ng/profile-actions.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/profile-dyninclude.sh b/tests-ng/profile-dyninclude.sh index 37ed483..8f9921d 100755 --- a/tests-ng/profile-dyninclude.sh +++ b/tests-ng/profile-dyninclude.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/profile-dynvariables.sh b/tests-ng/profile-dynvariables.sh index 5f9522e..845abfc 100755 --- a/tests-ng/profile-dynvariables.sh +++ b/tests-ng/profile-dynvariables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/profile-import-dotfiles.sh b/tests-ng/profile-import-dotfiles.sh index 42f7424..cd8677a 100755 --- a/tests-ng/profile-import-dotfiles.sh +++ b/tests-ng/profile-import-dotfiles.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/profile-undefined-variables.sh b/tests-ng/profile-undefined-variables.sh index b803d08..a623a82 100755 --- a/tests-ng/profile-undefined-variables.sh +++ b/tests-ng/profile-undefined-variables.sh @@ -34,7 +34,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/re-import.sh b/tests-ng/re-import.sh index c991763..4801ae6 100755 --- a/tests-ng/re-import.sh +++ b/tests-ng/re-import.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/recinclude.sh b/tests-ng/recinclude.sh index 3f9da4b..9b1836a 100755 --- a/tests-ng/recinclude.sh +++ b/tests-ng/recinclude.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/recvariables.sh b/tests-ng/recvariables.sh index ebb7f2b..924ded0 100755 --- a/tests-ng/recvariables.sh +++ b/tests-ng/recvariables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi diff --git a/tests-ng/remove.sh b/tests-ng/remove.sh index 90b7862..7f525e9 100755 --- a/tests-ng/remove.sh +++ b/tests-ng/remove.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/symlink-relative.sh b/tests-ng/symlink-relative.sh index 8bd6690..8508428 100755 --- a/tests-ng/symlink-relative.sh +++ b/tests-ng/symlink-relative.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/symlink.sh b/tests-ng/symlink.sh index 0806ac2..8cd5e83 100755 --- a/tests-ng/symlink.sh +++ b/tests-ng/symlink.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/template-dotpath.sh b/tests-ng/template-dotpath.sh index 5302e1e..da63fb6 100755 --- a/tests-ng/template-dotpath.sh +++ b/tests-ng/template-dotpath.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/template-link-value.sh b/tests-ng/template-link-value.sh index 1c3e400..ddde131 100755 --- a/tests-ng/template-link-value.sh +++ b/tests-ng/template-link-value.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/toml.sh b/tests-ng/toml.sh index 8bc1d33..d0c2ca5 100755 --- a/tests-ng/toml.sh +++ b/tests-ng/toml.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/transformations-template.sh b/tests-ng/transformations-template.sh index 28c4583..da9bea8 100755 --- a/tests-ng/transformations-template.sh +++ b/tests-ng/transformations-template.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/transformations-with-args.sh b/tests-ng/transformations-with-args.sh index 4834561..1acf1ef 100755 --- a/tests-ng/transformations-with-args.sh +++ b/tests-ng/transformations-with-args.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/transformations.sh b/tests-ng/transformations.sh index 4fb1371..6b7ef0d 100755 --- a/tests-ng/transformations.sh +++ b/tests-ng/transformations.sh @@ -35,7 +35,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-ignore-missing.sh b/tests-ng/update-ignore-missing.sh index 18a5b24..2a68426 100755 --- a/tests-ng/update-ignore-missing.sh +++ b/tests-ng/update-ignore-missing.sh @@ -28,7 +28,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-ignore-relative.sh b/tests-ng/update-ignore-relative.sh index 4dfaf86..38398cb 100755 --- a/tests-ng/update-ignore-relative.sh +++ b/tests-ng/update-ignore-relative.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-ignore.sh b/tests-ng/update-ignore.sh index bf180a5..7b9fcb7 100755 --- a/tests-ng/update-ignore.sh +++ b/tests-ng/update-ignore.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-negative-ignore-relative.sh b/tests-ng/update-negative-ignore-relative.sh index 519bbbc..6bf77f8 100755 --- a/tests-ng/update-negative-ignore-relative.sh +++ b/tests-ng/update-negative-ignore-relative.sh @@ -27,7 +27,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-negative-ignore.sh b/tests-ng/update-negative-ignore.sh index c10a3ab..19d92a8 100755 --- a/tests-ng/update-negative-ignore.sh +++ b/tests-ng/update-negative-ignore.sh @@ -32,7 +32,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-profile-check.sh b/tests-ng/update-profile-check.sh index 8a9d859..064fc7a 100755 --- a/tests-ng/update-profile-check.sh +++ b/tests-ng/update-profile-check.sh @@ -28,7 +28,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-rights.sh b/tests-ng/update-rights.sh index 0cee9e3..5271a8a 100755 --- a/tests-ng/update-rights.sh +++ b/tests-ng/update-rights.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-templates.sh b/tests-ng/update-templates.sh index d20c62c..4010a08 100755 --- a/tests-ng/update-templates.sh +++ b/tests-ng/update-templates.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update-with-key.sh b/tests-ng/update-with-key.sh index 98da335..9484cb4 100755 --- a/tests-ng/update-with-key.sh +++ b/tests-ng/update-with-key.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/update.sh b/tests-ng/update.sh index 92edd59..a8bb137 100755 --- a/tests-ng/update.sh +++ b/tests-ng/update.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/uservariables.sh b/tests-ng/uservariables.sh index 7dc466a..65db03c 100755 --- a/tests-ng/uservariables.sh +++ b/tests-ng/uservariables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/variables-enrich.sh b/tests-ng/variables-enrich.sh index d93e12f..945460a 100755 --- a/tests-ng/variables-enrich.sh +++ b/tests-ng/variables-enrich.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/variables-include.sh b/tests-ng/variables-include.sh index 4ab7406..483fb2f 100755 --- a/tests-ng/variables-include.sh +++ b/tests-ng/variables-include.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/variables.sh b/tests-ng/variables.sh index 39b0140..5a3b808 100755 --- a/tests-ng/variables.sh +++ b/tests-ng/variables.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/workdir-compare.sh b/tests-ng/workdir-compare.sh index 13de05b..aff7d5b 100755 --- a/tests-ng/workdir-compare.sh +++ b/tests-ng/workdir-compare.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-ng/workdir.sh b/tests-ng/workdir.sh index bd91d4f..d35d49a 100755 --- a/tests-ng/workdir.sh +++ b/tests-ng/workdir.sh @@ -33,7 +33,7 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" bin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - bin="coverage run -a --source=dotdrop -m dotdrop.dotdrop" + bin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" fi echo "dotdrop path: ${ddpath}" diff --git a/tests-requirements.txt b/tests-requirements.txt index b1f2e91..36e4545 100644 --- a/tests-requirements.txt +++ b/tests-requirements.txt @@ -1,5 +1,5 @@ pycodestyle; python_version > '3.5' -nose2; python_version > '3.5' +pytest; python_version > '3.5' coverage; python_version > '3.5' coveralls; python_version > '3.5' pyflakes; python_version > '3.5' diff --git a/tests.sh b/tests.sh index cdfeaf8..d2c2866 100755 --- a/tests.sh +++ b/tests.sh @@ -41,5 +41,8 @@ echo "unittest..." echo "tests-ng..." "${cur}"/scripts/check-tests-ng.sh +# merge coverage +coverage combine + ## done echo "All tests finished successfully"