| 1 |
commit: f60282d584bf9456f4a2ec2a1ebdf87f33b82ea2 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 2 07:08:33 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 2 08:29:15 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60282d5 |
| 7 |
|
| 8 |
eclass/tests/distutils-r1.sh: Normalize whitespace |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/tests/distutils-r1.sh | 15 +++++++++------ |
| 13 |
1 file changed, 9 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/tests/distutils-r1.sh b/eclass/tests/distutils-r1.sh |
| 16 |
index b511e19d9e7..237fc1eebae 100755 |
| 17 |
--- a/eclass/tests/distutils-r1.sh |
| 18 |
+++ b/eclass/tests/distutils-r1.sh |
| 19 |
@@ -31,13 +31,16 @@ test-distutils_enable_tests() { |
| 20 |
|
| 21 |
distutils_enable_tests "${runner}" |
| 22 |
|
| 23 |
- local ret var |
| 24 |
+ local ret var val |
| 25 |
for var in IUSE RESTRICT BDEPEND; do |
| 26 |
local exp_var=exp_${var} |
| 27 |
- if [[ ${!var} != "${!exp_var}" ]]; then |
| 28 |
+ # (this normalizes whitespace) |
| 29 |
+ read -a val <<<"${!var}" |
| 30 |
+ val=${val[*]} |
| 31 |
+ if [[ ${val} != "${!exp_var}" ]]; then |
| 32 |
eindent |
| 33 |
eerror "${var} expected: ${!exp_var}" |
| 34 |
- eerror "${var} actual: ${!var}" |
| 35 |
+ eerror "${var} actual: ${val}" |
| 36 |
eoutdent |
| 37 |
ret=1 |
| 38 |
tret=1 |
| 39 |
@@ -64,15 +67,15 @@ einfo distutils_enable_tests |
| 40 |
eindent |
| 41 |
BASE_IUSE="python_targets_python3_8" |
| 42 |
BASE_DEPS="python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,-python_single_target_python3_8(-)]" |
| 43 |
-TEST_RESTRICT=" !test? ( test )" |
| 44 |
+TEST_RESTRICT="!test? ( test )" |
| 45 |
|
| 46 |
einfo "empty RDEPEND" |
| 47 |
eindent |
| 48 |
RDEPEND="" |
| 49 |
test-distutils_enable_tests pytest \ |
| 50 |
- "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/pytest-4.5.0[${PYTHON_USEDEP}] )" |
| 51 |
+ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/pytest-4.5.0[${PYTHON_USEDEP}] )" |
| 52 |
test-distutils_enable_tests nose \ |
| 53 |
- "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )" |
| 54 |
+ "${BASE_IUSE} test" "${TEST_RESTRICT}" "${BASE_DEPS} test? ( >=dev-python/nose-1.3.7-r4[${PYTHON_USEDEP}] )" |
| 55 |
test-distutils_enable_tests unittest \ |
| 56 |
"${BASE_IUSE}" "" "${BASE_DEPS}" |
| 57 |
test-distutils_enable_tests setup.py \ |
Archives