Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
dfaa2a0f
by 😸 at 2020-08-30T13:51:14+02:00
2 changed files:
Changes:
... | ... | @@ -37,7 +37,12 @@ dak-setup() { |
37 | 37 |
SYS_CMD=""
|
38 | 38 |
USER_CMD=""
|
39 | 39 |
if [ "$RUN_COVERAGE" = "y" ]; then
|
40 |
- PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
|
|
40 |
+ if [ "${DAK_PYTHON3:-n}" = "y" ]; then
|
|
41 |
+ COVERAGE_CMD=python3-coverage
|
|
42 |
+ else
|
|
43 |
+ COVERAGE_CMD=python-coverage
|
|
44 |
+ fi
|
|
45 |
+ PYTHON_COVERAGE="${COVERAGE_CMD} run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
|
|
41 | 46 |
else
|
42 | 47 |
PYTHON_COVERAGE=
|
43 | 48 |
fi
|
... | ... | @@ -24,7 +24,12 @@ else |
24 | 24 |
KEEP_ENV_OPT=""
|
25 | 25 |
USER_CMD=""
|
26 | 26 |
if [ "$RUN_COVERAGE" = "y" ]; then
|
27 |
- PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
|
|
27 |
+ if [ "${DAK_PYTHON3:-n}" = "y" ]; then
|
|
28 |
+ COVERAGE_CMD=python3-coverage
|
|
29 |
+ else
|
|
30 |
+ COVERAGE_CMD=python-coverage
|
|
31 |
+ fi
|
|
32 |
+ PYTHON_COVERAGE="${COVERAGE_CMD} run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
|
|
28 | 33 |
else
|
29 | 34 |
PYTHON_COVERAGE=
|
30 | 35 |
fi
|