diff --git a/.gitignore b/.gitignore index 6e6f809..4a18301 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ venv .coverage .coverage* htmlcov +coverages/ # IDE .idea/ diff --git a/scripts/check-unittests.sh b/scripts/check-unittests.sh index f79cf3e..451b38b 100755 --- a/scripts/check-unittests.sh +++ b/scripts/check-unittests.sh @@ -10,4 +10,5 @@ if [ -n "${DOTDROP_WORKERS}" ]; then echo "DISABLE workers for unittests" fi -coverage run -p -m pytest tests \ No newline at end of file +mkdir -p coverages/ +coverage run -p --data-file coverages/coverage -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 f4c10c7..1e6319f 100755 --- a/tests-ng/actions-args-template.sh +++ b/tests-ng/actions-args-template.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/actions-args.sh b/tests-ng/actions-args.sh index 8ae14c3..79be03b 100755 --- a/tests-ng/actions-args.sh +++ b/tests-ng/actions-args.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/actions-default.sh b/tests-ng/actions-default.sh index da1d01c..db7753b 100755 --- a/tests-ng/actions-default.sh +++ b/tests-ng/actions-default.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/actions-empty-dir.sh b/tests-ng/actions-empty-dir.sh index 689393a..ed7af56 100755 --- a/tests-ng/actions-empty-dir.sh +++ b/tests-ng/actions-empty-dir.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/actions-pre.sh b/tests-ng/actions-pre.sh index 91226c2..8a3cf1a 100755 --- a/tests-ng/actions-pre.sh +++ b/tests-ng/actions-pre.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/actions-template.sh b/tests-ng/actions-template.sh index 2746eae..b29eea1 100755 --- a/tests-ng/actions-template.sh +++ b/tests-ng/actions-template.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/actions.sh b/tests-ng/actions.sh index b7281b8..57f7c15 100755 --- a/tests-ng/actions.sh +++ b/tests-ng/actions.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/bad-diff-cmd.sh b/tests-ng/bad-diff-cmd.sh index 5802102..0a0ed90 100755 --- a/tests-ng/bad-diff-cmd.sh +++ b/tests-ng/bad-diff-cmd.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/chmod-compare.sh b/tests-ng/chmod-compare.sh index 1e07bdf..2db8015 100755 --- a/tests-ng/chmod-compare.sh +++ b/tests-ng/chmod-compare.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/chmod-import.sh b/tests-ng/chmod-import.sh index c67798e..dad0cd2 100755 --- a/tests-ng/chmod-import.sh +++ b/tests-ng/chmod-import.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/chmod-install.sh b/tests-ng/chmod-install.sh index 7cfab4e..8769cb5 100755 --- a/tests-ng/chmod-install.sh +++ b/tests-ng/chmod-install.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/chmod-more.sh b/tests-ng/chmod-more.sh index 51c3971..3a626f1 100755 --- a/tests-ng/chmod-more.sh +++ b/tests-ng/chmod-more.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/chmod-preserve-install.sh b/tests-ng/chmod-preserve-install.sh index af8e5c0..debf27d 100755 --- a/tests-ng/chmod-preserve-install.sh +++ b/tests-ng/chmod-preserve-install.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/chmod-preserve-update.sh b/tests-ng/chmod-preserve-update.sh index 366447e..4fb9275 100755 --- a/tests-ng/chmod-preserve-update.sh +++ b/tests-ng/chmod-preserve-update.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/chmod-update.sh b/tests-ng/chmod-update.sh index 85773cc..c57f63c 100755 --- a/tests-ng/chmod-update.sh +++ b/tests-ng/chmod-update.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/clear-workdir.sh b/tests-ng/clear-workdir.sh index 426c456..9d5bd92 100755 --- a/tests-ng/clear-workdir.sh +++ b/tests-ng/clear-workdir.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers @@ -66,8 +67,8 @@ ret="$?" [ "${ret}" != "0" ] && echo "install returned ${ret}" && exit 1 # checks -[ ! -e "${tmpd}"/x ] && echo "f_x not installed" && exit 1 -[ ! -h "${tmpd}"/x ] && echo "f_x not symlink" && exit 1 +[ ! -e "${tmpd}"/x ] && echo "f_x not installed (${tmpd}/x)" && exit 1 +[ ! -h "${tmpd}"/x ] && echo "f_x not symlink (${tmpd}/x)" && exit 1 [ ! -e "${DOTDROP_WORKDIR}"/"${tmpd}"/x ] && echo "f_x not in workdir (${DOTDROP_WORKDIR}/${tmpd})" && exit 1 # add file diff --git a/tests-ng/compare-diff-types.sh b/tests-ng/compare-diff-types.sh index 9e76b68..5ce6647 100755 --- a/tests-ng/compare-diff-types.sh +++ b/tests-ng/compare-diff-types.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-global-negative-ignore.sh b/tests-ng/compare-global-negative-ignore.sh index eb2dcfa..d0d24d8 100755 --- a/tests-ng/compare-global-negative-ignore.sh +++ b/tests-ng/compare-global-negative-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-ignore-missing.sh b/tests-ng/compare-ignore-missing.sh index d7b70f5..363df9d 100755 --- a/tests-ng/compare-ignore-missing.sh +++ b/tests-ng/compare-ignore-missing.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-ignore-relative.sh b/tests-ng/compare-ignore-relative.sh index fa5643b..da80def 100755 --- a/tests-ng/compare-ignore-relative.sh +++ b/tests-ng/compare-ignore-relative.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-ignore.sh b/tests-ng/compare-ignore.sh index 5f90182..5648a65 100755 --- a/tests-ng/compare-ignore.sh +++ b/tests-ng/compare-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-include.sh b/tests-ng/compare-include.sh index 137abd5..927063c 100755 --- a/tests-ng/compare-include.sh +++ b/tests-ng/compare-include.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-negative-ignore-all-but.sh b/tests-ng/compare-negative-ignore-all-but.sh index 6a3de88..35cec5d 100755 --- a/tests-ng/compare-negative-ignore-all-but.sh +++ b/tests-ng/compare-negative-ignore-all-but.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-negative-ignore-relative.sh b/tests-ng/compare-negative-ignore-relative.sh index b36a909..e9e40c7 100755 --- a/tests-ng/compare-negative-ignore-relative.sh +++ b/tests-ng/compare-negative-ignore-relative.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare-profile-check.sh b/tests-ng/compare-profile-check.sh index 9c38b93..f61ef0a 100755 --- a/tests-ng/compare-profile-check.sh +++ b/tests-ng/compare-profile-check.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/compare.sh b/tests-ng/compare.sh index 4e05197..359f0e3 100755 --- a/tests-ng/compare.sh +++ b/tests-ng/compare.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/corner-case.sh b/tests-ng/corner-case.sh index dc34f87..f2a0cc0 100755 --- a/tests-ng/corner-case.sh +++ b/tests-ng/corner-case.sh @@ -18,7 +18,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/deprecated-link.sh b/tests-ng/deprecated-link.sh index 71cec7c..2d81e3d 100755 --- a/tests-ng/deprecated-link.sh +++ b/tests-ng/deprecated-link.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/diff-cmd.sh b/tests-ng/diff-cmd.sh index 792d95f..c8eb974 100755 --- a/tests-ng/diff-cmd.sh +++ b/tests-ng/diff-cmd.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dir-import-update.sh b/tests-ng/dir-import-update.sh index 919347d..a3ab53b 100755 --- a/tests-ng/dir-import-update.sh +++ b/tests-ng/dir-import-update.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dotdrop-variables.sh b/tests-ng/dotdrop-variables.sh index 2a7f796..c3ce000 100755 --- a/tests-ng/dotdrop-variables.sh +++ b/tests-ng/dotdrop-variables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dotfile-no-src.sh b/tests-ng/dotfile-no-src.sh index 80778bf..97074e8 100755 --- a/tests-ng/dotfile-no-src.sh +++ b/tests-ng/dotfile-no-src.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dotfile-sub-variables.sh b/tests-ng/dotfile-sub-variables.sh index cc7ffd5..2ce8101 100755 --- a/tests-ng/dotfile-sub-variables.sh +++ b/tests-ng/dotfile-sub-variables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dotfile-variables.sh b/tests-ng/dotfile-variables.sh index c29deaf..2e4c4fc 100755 --- a/tests-ng/dotfile-variables.sh +++ b/tests-ng/dotfile-variables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dotfiles-all.sh b/tests-ng/dotfiles-all.sh index 1e1cb0b..90ebbfe 100755 --- a/tests-ng/dotfiles-all.sh +++ b/tests-ng/dotfiles-all.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dotfiles-dyn-paths.sh b/tests-ng/dotfiles-dyn-paths.sh index 0a10301..e03fd24 100755 --- a/tests-ng/dotfiles-dyn-paths.sh +++ b/tests-ng/dotfiles-dyn-paths.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/double-config-import.sh b/tests-ng/double-config-import.sh index ab45f2f..f89dd2b 100755 --- a/tests-ng/double-config-import.sh +++ b/tests-ng/double-config-import.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dry.sh b/tests-ng/dry.sh index df54e82..6ce24a0 100755 --- a/tests-ng/dry.sh +++ b/tests-ng/dry.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/duplicate-key.sh b/tests-ng/duplicate-key.sh index 44011f0..b4a13ef 100755 --- a/tests-ng/duplicate-key.sh +++ b/tests-ng/duplicate-key.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dynactions.sh b/tests-ng/dynactions.sh index ba363f4..16c6a3a 100755 --- a/tests-ng/dynactions.sh +++ b/tests-ng/dynactions.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dyndotfilepaths.sh b/tests-ng/dyndotfilepaths.sh index 6034d36..5f72f46 100755 --- a/tests-ng/dyndotfilepaths.sh +++ b/tests-ng/dyndotfilepaths.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dynextvariables.sh b/tests-ng/dynextvariables.sh index d788cbe..25045b6 100755 --- a/tests-ng/dynextvariables.sh +++ b/tests-ng/dynextvariables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dyninclude.sh b/tests-ng/dyninclude.sh index 86367d6..68fb122 100755 --- a/tests-ng/dyninclude.sh +++ b/tests-ng/dyninclude.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/dynvariables.sh b/tests-ng/dynvariables.sh index 42f0ccd..9eb59d8 100755 --- a/tests-ng/dynvariables.sh +++ b/tests-ng/dynvariables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/env.sh b/tests-ng/env.sh index aa6415a..cdff81a 100755 --- a/tests-ng/env.sh +++ b/tests-ng/env.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/ext-actions.sh b/tests-ng/ext-actions.sh index 21bab53..a95538e 100755 --- a/tests-ng/ext-actions.sh +++ b/tests-ng/ext-actions.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/extvariables.sh b/tests-ng/extvariables.sh index 57c8356..692235a 100755 --- a/tests-ng/extvariables.sh +++ b/tests-ng/extvariables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/filter_file.sh b/tests-ng/filter_file.sh index 7613112..52ae3cf 100755 --- a/tests-ng/filter_file.sh +++ b/tests-ng/filter_file.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/force-actions.sh b/tests-ng/force-actions.sh index 97fa63d..ca92c61 100755 --- a/tests-ng/force-actions.sh +++ b/tests-ng/force-actions.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/func_file.sh b/tests-ng/func_file.sh index a760cba..ad7d9bb 100755 --- a/tests-ng/func_file.sh +++ b/tests-ng/func_file.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/global-compare-ignore.sh b/tests-ng/global-compare-ignore.sh index 4f3bc8e..e2aec69 100755 --- a/tests-ng/global-compare-ignore.sh +++ b/tests-ng/global-compare-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/global-update-ignore.sh b/tests-ng/global-update-ignore.sh index 48856f2..74502cc 100755 --- a/tests-ng/global-update-ignore.sh +++ b/tests-ng/global-update-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/globs.sh b/tests-ng/globs.sh index f2d77de..a2673ee 100755 --- a/tests-ng/globs.sh +++ b/tests-ng/globs.sh @@ -16,7 +16,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/header.sh b/tests-ng/header.sh index 6cc5278..f1bdd6f 100755 --- a/tests-ng/header.sh +++ b/tests-ng/header.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/ignore-empty.sh b/tests-ng/ignore-empty.sh index 6670289..bf9bbb1 100755 --- a/tests-ng/ignore-empty.sh +++ b/tests-ng/ignore-empty.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-as.sh b/tests-ng/import-as.sh index e12c362..90fbdad 100755 --- a/tests-ng/import-as.sh +++ b/tests-ng/import-as.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-configs.sh b/tests-ng/import-configs.sh index 4b4f829..63510a8 100755 --- a/tests-ng/import-configs.sh +++ b/tests-ng/import-configs.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-configs2.sh b/tests-ng/import-configs2.sh index 215bad3..05ffda0 100755 --- a/tests-ng/import-configs2.sh +++ b/tests-ng/import-configs2.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-duplicate.sh b/tests-ng/import-duplicate.sh index dedcfff..2480c65 100755 --- a/tests-ng/import-duplicate.sh +++ b/tests-ng/import-duplicate.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-ignore.sh b/tests-ng/import-ignore.sh index 50be7bf..419aa8e 100755 --- a/tests-ng/import-ignore.sh +++ b/tests-ng/import-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-include.sh b/tests-ng/import-include.sh index 76a6cc9..c9d1b6e 100755 --- a/tests-ng/import-include.sh +++ b/tests-ng/import-include.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-link-children.sh b/tests-ng/import-link-children.sh index 5cfea67..c928716 100755 --- a/tests-ng/import-link-children.sh +++ b/tests-ng/import-link-children.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-negative-ignore-all-but.sh b/tests-ng/import-negative-ignore-all-but.sh index cf030e0..cb12a72 100755 --- a/tests-ng/import-negative-ignore-all-but.sh +++ b/tests-ng/import-negative-ignore-all-but.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-negative-ignore.sh b/tests-ng/import-negative-ignore.sh index d761381..9c244be 100755 --- a/tests-ng/import-negative-ignore.sh +++ b/tests-ng/import-negative-ignore.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-non-existing.sh b/tests-ng/import-non-existing.sh index a9a21d1..5cf3353 100755 --- a/tests-ng/import-non-existing.sh +++ b/tests-ng/import-non-existing.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-profile-dotfiles.sh b/tests-ng/import-profile-dotfiles.sh index 212c3f0..c82c03b 100755 --- a/tests-ng/import-profile-dotfiles.sh +++ b/tests-ng/import-profile-dotfiles.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-subfile.sh b/tests-ng/import-subfile.sh index bc3f55b..de8c712 100755 --- a/tests-ng/import-subfile.sh +++ b/tests-ng/import-subfile.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-to-no-profile.sh b/tests-ng/import-to-no-profile.sh index 82ff737..d474570 100755 --- a/tests-ng/import-to-no-profile.sh +++ b/tests-ng/import-to-no-profile.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-variables.sh b/tests-ng/import-variables.sh index 2b68276..82c2a8d 100755 --- a/tests-ng/import-variables.sh +++ b/tests-ng/import-variables.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-with-empty.sh b/tests-ng/import-with-empty.sh index 8caeda4..fd1467d 100755 --- a/tests-ng/import-with-empty.sh +++ b/tests-ng/import-with-empty.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import-with-trans.sh b/tests-ng/import-with-trans.sh index f9eb60e..fae7009 100755 --- a/tests-ng/import-with-trans.sh +++ b/tests-ng/import-with-trans.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/import.sh b/tests-ng/import.sh index ea7d4bd..902f38f 100755 --- a/tests-ng/import.sh +++ b/tests-ng/import.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/imported-configs-variables.sh b/tests-ng/imported-configs-variables.sh index 37b7b23..5b521cd 100755 --- a/tests-ng/imported-configs-variables.sh +++ b/tests-ng/imported-configs-variables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/imported-variables-from-config.sh b/tests-ng/imported-variables-from-config.sh index 9f078b1..8d0fe0e 100755 --- a/tests-ng/imported-variables-from-config.sh +++ b/tests-ng/imported-variables-from-config.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/include-actions.sh b/tests-ng/include-actions.sh index 7b7cbda..610dab1 100755 --- a/tests-ng/include-actions.sh +++ b/tests-ng/include-actions.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/include-order.sh b/tests-ng/include-order.sh index ee24b57..6376e8d 100755 --- a/tests-ng/include-order.sh +++ b/tests-ng/include-order.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/include-variables.sh b/tests-ng/include-variables.sh index fb46743..a1b63c5 100755 --- a/tests-ng/include-variables.sh +++ b/tests-ng/include-variables.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/include.sh b/tests-ng/include.sh index f120805..c7a0026 100755 --- a/tests-ng/include.sh +++ b/tests-ng/include.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/inst-link-default.sh b/tests-ng/inst-link-default.sh index c5bee54..853e984 100755 --- a/tests-ng/inst-link-default.sh +++ b/tests-ng/inst-link-default.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/install-empty.sh b/tests-ng/install-empty.sh index 8addee6..eed41a5 100755 --- a/tests-ng/install-empty.sh +++ b/tests-ng/install-empty.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/install-ignore.sh b/tests-ng/install-ignore.sh index ce46cb7..96fb03f 100755 --- a/tests-ng/install-ignore.sh +++ b/tests-ng/install-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/install-link-children.sh b/tests-ng/install-link-children.sh index f6b03b8..6c59475 100755 --- a/tests-ng/install-link-children.sh +++ b/tests-ng/install-link-children.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers @@ -73,17 +74,16 @@ cd "${ddpath}" | ${bin} install -f -c "${cfg}" -p p1 -V #cat ${cfg} # check normal -[ ! -d "${tmpd}"/dir1 ] && exit 1 -[ -d "${tmpd}"/dir1/empty ] && exit 1 -[ -d "${tmpd}"/dir1/sub ] && exit 1 -[ -d "${tmpd}"/dir1/sub/empty ] && exit 1 -[ ! -d "${tmpd}"/dir1/not-empty ] && exit 1 - -[ ! -e "${tmpd}"/dir1/not-empty/file ] && exit 1 +[ ! -d "${tmpd}"/dir1 ] && echo "not dir \"${tmpd}/dir1\"" && exit 1 +[ -d "${tmpd}"/dir1/empty ] && echo "exists: \"${tmpd}/dir1/empty\"" && exit 1 +[ -d "${tmpd}"/dir1/sub ] && echo "exists: \"${tmpd}/dir1/sub\"" && exit 1 +[ -d "${tmpd}"/dir1/sub/empty ] && echo "exists: \"${tmpd}/dir1/sub/empty\"" && exit 1 +[ ! -d "${tmpd}"/dir1/not-empty ] && echo "not dir: \"${tmpd}/dir1/not-empty\"" && exit 1 +[ ! -e "${tmpd}"/dir1/not-empty/file ] && echo "not exists: \"${tmpd}/dir1/not-empty/file\"" && exit 1 # ignored files -[ -e "${tmpd}"/dir1/empty/this.ignore ] && exit 1 -[ -e "${tmpd}"/dir1/sub/empty/that.ignore ] && exit 1 +[ -e "${tmpd}"/dir1/empty/this.ignore ] && echo "exists: \"${tmpd}/dir1/empty/this.ignore\"" && exit 1 +[ -e "${tmpd}"/dir1/sub/empty/that.ignore ] && echo "exists: \"${tmpd}/dir1/sub/empty/that.ignore\"" && exit 1 cat "${tmpd}"/dir1/not-empty/file grep "p1" "${tmpd}"/dir1/not-empty/file diff --git a/tests-ng/install-negative-ignore-all-but.sh b/tests-ng/install-negative-ignore-all-but.sh index 45e21b7..dd224f6 100755 --- a/tests-ng/install-negative-ignore-all-but.sh +++ b/tests-ng/install-negative-ignore-all-but.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/install-negative-ignore-no-match.sh b/tests-ng/install-negative-ignore-no-match.sh index 42d1547..ac99c22 100755 --- a/tests-ng/install-negative-ignore-no-match.sh +++ b/tests-ng/install-negative-ignore-no-match.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/install-negative-ignore.sh b/tests-ng/install-negative-ignore.sh index 95b87c0..e6b0d70 100755 --- a/tests-ng/install-negative-ignore.sh +++ b/tests-ng/install-negative-ignore.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/install-to-temp.sh b/tests-ng/install-to-temp.sh index c8069f6..61b106c 100755 --- a/tests-ng/install-to-temp.sh +++ b/tests-ng/install-to-temp.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/install.sh b/tests-ng/install.sh index 21bf8ed..9a39185 100755 --- a/tests-ng/install.sh +++ b/tests-ng/install.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/jhelpers.sh b/tests-ng/jhelpers.sh index 86c54a2..e5b2097 100755 --- a/tests-ng/jhelpers.sh +++ b/tests-ng/jhelpers.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/key-prefix-sep.sh b/tests-ng/key-prefix-sep.sh index 67df4aa..2bd288a 100755 --- a/tests-ng/key-prefix-sep.sh +++ b/tests-ng/key-prefix-sep.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/link-import-default.sh b/tests-ng/link-import-default.sh index 72769cf..19981c4 100755 --- a/tests-ng/link-import-default.sh +++ b/tests-ng/link-import-default.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/link-templates-dir-home.sh b/tests-ng/link-templates-dir-home.sh index 60224cf..d6ea82f 100755 --- a/tests-ng/link-templates-dir-home.sh +++ b/tests-ng/link-templates-dir-home.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/link-templates-dir.sh b/tests-ng/link-templates-dir.sh index 65d9dcb..a879a13 100755 --- a/tests-ng/link-templates-dir.sh +++ b/tests-ng/link-templates-dir.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/link-templates.sh b/tests-ng/link-templates.sh index fb63fdf..9f12361 100755 --- a/tests-ng/link-templates.sh +++ b/tests-ng/link-templates.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/link-value-tests.sh b/tests-ng/link-value-tests.sh index 682be82..3f748e5 100755 --- a/tests-ng/link-value-tests.sh +++ b/tests-ng/link-value-tests.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/macro-with-globals.sh b/tests-ng/macro-with-globals.sh index 7c4446e..496bfc0 100755 --- a/tests-ng/macro-with-globals.sh +++ b/tests-ng/macro-with-globals.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/minversion.sh b/tests-ng/minversion.sh index 21c44ef..0be1fd3 100755 --- a/tests-ng/minversion.sh +++ b/tests-ng/minversion.sh @@ -11,7 +11,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/misc.sh b/tests-ng/misc.sh index 281dcb0..abcee95 100755 --- a/tests-ng/misc.sh +++ b/tests-ng/misc.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/notemplate.sh b/tests-ng/notemplate.sh index 7f5b6ae..6490064 100755 --- a/tests-ng/notemplate.sh +++ b/tests-ng/notemplate.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/profile-actions.sh b/tests-ng/profile-actions.sh index 5d78809..bb4e737 100755 --- a/tests-ng/profile-actions.sh +++ b/tests-ng/profile-actions.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/profile-dyninclude.sh b/tests-ng/profile-dyninclude.sh index 239d515..a9f11d3 100755 --- a/tests-ng/profile-dyninclude.sh +++ b/tests-ng/profile-dyninclude.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/profile-dynvariables.sh b/tests-ng/profile-dynvariables.sh index 5ed42db..7ba59b4 100755 --- a/tests-ng/profile-dynvariables.sh +++ b/tests-ng/profile-dynvariables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/profile-import-dotfiles.sh b/tests-ng/profile-import-dotfiles.sh index 8101bbf..fececb5 100755 --- a/tests-ng/profile-import-dotfiles.sh +++ b/tests-ng/profile-import-dotfiles.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/profile-undefined-variables.sh b/tests-ng/profile-undefined-variables.sh index a1f7d72..7aac93e 100755 --- a/tests-ng/profile-undefined-variables.sh +++ b/tests-ng/profile-undefined-variables.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/re-import.sh b/tests-ng/re-import.sh index 6a7a5f9..e452acf 100755 --- a/tests-ng/re-import.sh +++ b/tests-ng/re-import.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/recinclude.sh b/tests-ng/recinclude.sh index 08cf851..b49772d 100755 --- a/tests-ng/recinclude.sh +++ b/tests-ng/recinclude.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/recvariables.sh b/tests-ng/recvariables.sh index d90d7a2..dc50165 100755 --- a/tests-ng/recvariables.sh +++ b/tests-ng/recvariables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/remove.sh b/tests-ng/remove.sh index 1d15233..cd18ffd 100755 --- a/tests-ng/remove.sh +++ b/tests-ng/remove.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/symlink-relative.sh b/tests-ng/symlink-relative.sh index aaf53ec..3c9e282 100755 --- a/tests-ng/symlink-relative.sh +++ b/tests-ng/symlink-relative.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/symlink.sh b/tests-ng/symlink.sh index 5f0a374..7ebd22b 100755 --- a/tests-ng/symlink.sh +++ b/tests-ng/symlink.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/template-dotpath.sh b/tests-ng/template-dotpath.sh index 5dfa857..67691db 100755 --- a/tests-ng/template-dotpath.sh +++ b/tests-ng/template-dotpath.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/template-link-value.sh b/tests-ng/template-link-value.sh index 5aaa7dd..06e10ff 100755 --- a/tests-ng/template-link-value.sh +++ b/tests-ng/template-link-value.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/template-link.sh b/tests-ng/template-link.sh index dff19ef..ac724ad 100755 --- a/tests-ng/template-link.sh +++ b/tests-ng/template-link.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/toml.sh b/tests-ng/toml.sh index 3a99c00..952017b 100755 --- a/tests-ng/toml.sh +++ b/tests-ng/toml.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/transformations-template.sh b/tests-ng/transformations-template.sh index b249af9..d670773 100755 --- a/tests-ng/transformations-template.sh +++ b/tests-ng/transformations-template.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/transformations-with-args.sh b/tests-ng/transformations-with-args.sh index b8cee89..55ee368 100755 --- a/tests-ng/transformations-with-args.sh +++ b/tests-ng/transformations-with-args.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/transformations.sh b/tests-ng/transformations.sh index 68a02cf..1f9c5a8 100755 --- a/tests-ng/transformations.sh +++ b/tests-ng/transformations.sh @@ -14,7 +14,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-global-negative-ignore.sh b/tests-ng/update-global-negative-ignore.sh index 6a2b836..83cdb7c 100755 --- a/tests-ng/update-global-negative-ignore.sh +++ b/tests-ng/update-global-negative-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-ignore-missing.sh b/tests-ng/update-ignore-missing.sh index 5c9f2a7..4d346a2 100755 --- a/tests-ng/update-ignore-missing.sh +++ b/tests-ng/update-ignore-missing.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-ignore-relative.sh b/tests-ng/update-ignore-relative.sh index 56c56bb..1aa0489 100755 --- a/tests-ng/update-ignore-relative.sh +++ b/tests-ng/update-ignore-relative.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-ignore.sh b/tests-ng/update-ignore.sh index 988859f..d5ba2cd 100755 --- a/tests-ng/update-ignore.sh +++ b/tests-ng/update-ignore.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-negative-ignore-all-but.sh b/tests-ng/update-negative-ignore-all-but.sh index 4bbe8ad..dc0e3fe 100755 --- a/tests-ng/update-negative-ignore-all-but.sh +++ b/tests-ng/update-negative-ignore-all-but.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-negative-ignore-relative.sh b/tests-ng/update-negative-ignore-relative.sh index cb9995a..85ab90e 100755 --- a/tests-ng/update-negative-ignore-relative.sh +++ b/tests-ng/update-negative-ignore-relative.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-negative-ignore.sh b/tests-ng/update-negative-ignore.sh index a426943..d581716 100755 --- a/tests-ng/update-negative-ignore.sh +++ b/tests-ng/update-negative-ignore.sh @@ -12,7 +12,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-profile-check.sh b/tests-ng/update-profile-check.sh index 7755b11..01f6f44 100755 --- a/tests-ng/update-profile-check.sh +++ b/tests-ng/update-profile-check.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-rights.sh b/tests-ng/update-rights.sh index c29210c..ca7bad7 100755 --- a/tests-ng/update-rights.sh +++ b/tests-ng/update-rights.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-templates.sh b/tests-ng/update-templates.sh index ec7678f..7c21936 100755 --- a/tests-ng/update-templates.sh +++ b/tests-ng/update-templates.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update-with-key.sh b/tests-ng/update-with-key.sh index 6b40942..7d92890 100755 --- a/tests-ng/update-with-key.sh +++ b/tests-ng/update-with-key.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/update.sh b/tests-ng/update.sh index 663ab63..29cc8db 100755 --- a/tests-ng/update.sh +++ b/tests-ng/update.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/uservariables.sh b/tests-ng/uservariables.sh index f6ab82e..4f33564 100755 --- a/tests-ng/uservariables.sh +++ b/tests-ng/uservariables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/variables-enrich.sh b/tests-ng/variables-enrich.sh index 9a359e0..3d9edbe 100755 --- a/tests-ng/variables-enrich.sh +++ b/tests-ng/variables-enrich.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/variables-include.sh b/tests-ng/variables-include.sh index a389143..ab34c04 100755 --- a/tests-ng/variables-include.sh +++ b/tests-ng/variables-include.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/variables-nested.sh b/tests-ng/variables-nested.sh index 9ed3a0b..cbf78ba 100755 --- a/tests-ng/variables-nested.sh +++ b/tests-ng/variables-nested.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/variables.sh b/tests-ng/variables.sh index 92d1c77..1000be7 100755 --- a/tests-ng/variables.sh +++ b/tests-ng/variables.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/workdir-compare.sh b/tests-ng/workdir-compare.sh index 4696f17..e6605e1 100755 --- a/tests-ng/workdir-compare.sh +++ b/tests-ng/workdir-compare.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests-ng/workdir.sh b/tests-ng/workdir.sh index be741ff..70af235 100755 --- a/tests-ng/workdir.sh +++ b/tests-ng/workdir.sh @@ -13,7 +13,8 @@ ddpath="${cur}/../" export PYTHONPATH="${ddpath}:${PYTHONPATH}" altbin="python3 -m dotdrop.dotdrop" if hash coverage 2>/dev/null; then - altbin="coverage run -p --source=dotdrop -m dotdrop.dotdrop" + mkdir -p coverages/ + altbin="coverage run -p --data-file coverages/coverage --source=dotdrop -m dotdrop.dotdrop" fi bin="${DT_BIN:-${altbin}}" # shellcheck source=tests-ng/helpers diff --git a/tests.sh b/tests.sh index c855d38..d7d07e1 100755 --- a/tests.sh +++ b/tests.sh @@ -37,7 +37,7 @@ echo "tests-ng..." "${cur}"/scripts/check-tests-ng.sh # merge coverage -coverage combine +coverage combine coverages/ ## done echo "All tests finished successfully"