diff options
Diffstat (limited to 'lib/portage/tests/bin/test_filter_bash_env.py')
| -rw-r--r-- | lib/portage/tests/bin/test_filter_bash_env.py | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/lib/portage/tests/bin/test_filter_bash_env.py b/lib/portage/tests/bin/test_filter_bash_env.py index 7f0bdf52f..9040a5fef 100644 --- a/lib/portage/tests/bin/test_filter_bash_env.py +++ b/lib/portage/tests/bin/test_filter_bash_env.py @@ -1,4 +1,4 @@ -# Copyright 2018 Gentoo Foundation +# Copyright 2018-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import difflib @@ -12,11 +12,10 @@ from portage.tests import TestCase class TestFilterBashEnv(TestCase): def testTestFilterBashEnv(self): - test_cases = ( ( "RDEPEND BASH.* _EPATCH_ECLASS", - br"""declare -ir BASHPID="28997" + rb"""declare -ir BASHPID="28997" declare -rx A="portage-2.3.24.tar.bz2" declare -- DESKTOP_DATABASE_DIR="/usr/share/applications" declare PDEPEND=" @@ -34,12 +33,10 @@ declare -- _EUTILS_ECLASS="1" declare -- f get_libdir () { - local CONF_LIBDIR; - if [ -n "${CONF_LIBDIR_OVERRIDE}" ]; then - echo ${CONF_LIBDIR_OVERRIDE}; - else - get_abi_LIBDIR; - fi + local libdir_var="LIBDIR_${ABI}"; + local libdir="lib"; + [[ -n ${ABI} && -n ${!libdir_var} ]] && libdir=${!libdir_var}; + echo "${libdir}" } make_wrapper () { @@ -53,7 +50,7 @@ use_if_iuse () use $1 } """, - br"""declare -x A="portage-2.3.24.tar.bz2" + rb"""declare -x A="portage-2.3.24.tar.bz2" declare -- DESKTOP_DATABASE_DIR="/usr/share/applications" declare PDEPEND=" !build? ( @@ -66,12 +63,10 @@ declare -- _EUTILS_ECLASS="1" declare -- f get_libdir () { - local CONF_LIBDIR; - if [ -n "${CONF_LIBDIR_OVERRIDE}" ]; then - echo ${CONF_LIBDIR_OVERRIDE}; - else - get_abi_LIBDIR; - fi + local libdir_var="LIBDIR_${ABI}"; + local libdir="lib"; + [[ -n ${ABI} && -n ${!libdir_var} ]] && libdir=${!libdir_var}; + echo "${libdir}" } make_wrapper () { |