commit: e7474dec0dcc7c6dd20f4e0feaeda380f4bacd47
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 28 11:48:13 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Mar 28 11:48:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7474dec
eclass/tests: Update distutils-r1 expected values
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
eclass/tests/distutils-r1.sh | 4 ++--
eclass/tests/distutils-r1_single.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh
index 93496f9ac00..163a509b306 100755
--- a/eclass/tests/distutils-r1.sh
+++ b/eclass/tests/distutils-r1.sh
@@ -108,7 +108,7 @@ test-distutils_enable_tests pytest \
test-distutils_enable_tests nose \
"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
>=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )"
test-distutils_enable_tests unittest \
- "${BASE_IUSE}" "" "${BASE_DEPS}"
+ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
dev-python/unittest-or-fail[${PYTHON_USEDEP}] )"
test-distutils_enable_tests setup.py \
"${BASE_IUSE}" "" "${BASE_DEPS}"
eoutdent
@@ -122,7 +122,7 @@ test-distutils_enable_tests pytest \
test-distutils_enable_tests nose \
"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} >=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )"
test-distutils_enable_tests unittest \
- "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} )"
+ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} dev-python/unittest-or-fail[${PYTHON_USEDEP}] )"
test-distutils_enable_tests setup.py \
"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} )"
eoutdent
diff --git a/eclass/tests/distutils-r1_single.sh
b/eclass/tests/distutils-r1_single.sh
index 80c152b6ee0..fb177261d0a 100755
--- a/eclass/tests/distutils-r1_single.sh
+++ b/eclass/tests/distutils-r1_single.sh
@@ -88,7 +88,7 @@ test-distutils_enable_tests pytest \
test-distutils_enable_tests nose \
"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
python_single_target_python3_8? (
>=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)] ) )"
test-distutils_enable_tests unittest \
- "${BASE_IUSE}" "" "${BASE_DEPS}"
+ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
python_single_target_python3_8? (
dev-python/unittest-or-fail[python_targets_python3_8(-)] ) )"
test-distutils_enable_tests setup.py \
"${BASE_IUSE}" "" "${BASE_DEPS}"
eoutdent
@@ -102,7 +102,7 @@ test-distutils_enable_tests pytest \
test-distutils_enable_tests nose \
"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} python_single_target_python3_8? (
>=dev-python/nose-1.3.7-r4[python_targets_python3_8(-)] ) )"
test-distutils_enable_tests unittest \
- "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} )"
+ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} python_single_target_python3_8? (
dev-python/unittest-or-fail[python_targets_python3_8(-)] ) )"
test-distutils_enable_tests setup.py \
"${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? (
${BASE_RDEPEND} )"
eoutdent