summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-11-03 07:58:16 +0000
committerMichał Górny <mgorny@gentoo.org>2013-11-03 07:58:16 +0000
commit9642496bc377aec667025433a556d5e33cfda51e (patch)
tree737a0d45c6a4fa44a31e4947619b8ccb5d0b22e9 /eclass/tests
parentVersion bump (diff)
downloadgentoo-2-9642496bc377aec667025433a556d5e33cfda51e.tar.gz
gentoo-2-9642496bc377aec667025433a556d5e33cfda51e.tar.bz2
gentoo-2-9642496bc377aec667025433a556d5e33cfda51e.zip
Fix python-utils-r1 tests to accomodate versions in PYTHON_PKG_DEP.
Diffstat (limited to 'eclass/tests')
-rwxr-xr-xeclass/tests/python-utils-r1.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index 1e8fe1a0a67c..e3e9c6328ce7 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -37,7 +37,7 @@ test_var PYTHON python2_7 /usr/bin/python2.7
test_var PYTHON_SITEDIR python2_7 /usr/lib/python2.7/site-packages
test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
test_var PYTHON_LIBPATH python2_7 /usr/lib/libpython2.7$(get_libname)
-test_var PYTHON_PKG_DEP python2_7 dev-lang/python:2.7
+test_var PYTHON_PKG_DEP python2_7 '*dev-lang/python*:2.7'
test_var PYTHON_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
test_var EPYTHON python3_3 python3.3
@@ -45,20 +45,20 @@ test_var PYTHON python3_3 /usr/bin/python3.3
test_var PYTHON_SITEDIR python3_3 /usr/lib/python3.3/site-packages
test_var PYTHON_INCLUDEDIR python3_3 /usr/include/python3.3
test_var PYTHON_LIBPATH python3_3 /usr/lib/libpython3.3$(get_libname)
-test_var PYTHON_PKG_DEP python3_3 dev-lang/python:3.3
+test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3'
test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
test_var EPYTHON jython2_7 jython2.7
test_var PYTHON jython2_7 /usr/bin/jython2.7
test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
-test_var PYTHON_PKG_DEP jython2_7 dev-java/jython:2.7
+test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7'
test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
test_var EPYTHON pypy2_0 pypy-c2.0
test_var PYTHON pypy2_0 /usr/bin/pypy-c2.0
test_var PYTHON_SITEDIR pypy2_0 /usr/lib/pypy2.0/site-packages
test_var PYTHON_INCLUDEDIR pypy2_0 /usr/lib/pypy2.0/include
-test_var PYTHON_PKG_DEP pypy2_0 virtual/pypy:2.0
+test_var PYTHON_PKG_DEP pypy2_0 '*virtual/pypy*:2.0'
test_var PYTHON_SCRIPTDIR pypy2_0 /usr/lib/python-exec/pypy-c2.0
test_is python_is_python3 python2.7 1