* [gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/
@ 2015-11-07 9:40 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2015-11-07 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 1c1b80d7d7047c206ff125145db081b820352bec
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 09:39:25 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 09:39:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c1b80d7
python-utils-r1.eclass tests: Update for new includedir and libpath
Update PYTHON_INCLUDEDIR and PYTHON_LIBPATH tests to match new values,
and run them only if the relevant Python interpreter is installed.
eclass/tests/python-utils-r1.sh | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e49636a..4dae586 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -64,16 +64,20 @@ inherit python-utils-r1
test_var EPYTHON python2_7 python2.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)
+if [[ -x /usr/bin/python2.7 ]]; then
+ test_var PYTHON_INCLUDEDIR python2_7 /usr/include/python2.7
+ test_var PYTHON_LIBPATH python2_7 "/usr/lib*/libpython2.7$(get_libname)"
+fi
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
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)
+if [[ -x /usr/bin/python3.3 ]]; then
+ test_var PYTHON_INCLUDEDIR python3_3 "/usr/include/python3.3*"
+ test_var PYTHON_LIBPATH python3_3 "/usr/lib*/libpython3.3*$(get_libname)"
+fi
test_var PYTHON_PKG_DEP python3_3 '*dev-lang/python*:3.3'
test_var PYTHON_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
@@ -86,14 +90,18 @@ test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
test_var EPYTHON pypy pypy
test_var PYTHON pypy /usr/bin/pypy
test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages
-test_var PYTHON_INCLUDEDIR pypy /usr/lib/pypy/include
+if [[ -x /usr/bin/pypy ]]; then
+ test_var PYTHON_INCLUDEDIR pypy "/usr/lib*/pypy/include"
+fi
test_var PYTHON_PKG_DEP pypy '*virtual/pypy*:0='
test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
test_var EPYTHON pypy3 pypy3
test_var PYTHON pypy3 /usr/bin/pypy3
test_var PYTHON_SITEDIR pypy3 /usr/lib/pypy3/site-packages
-test_var PYTHON_INCLUDEDIR pypy3 /usr/lib/pypy3/include
+if [[ -x /usr/bin/pypy3 ]]; then
+ test_var PYTHON_INCLUDEDIR pypy3 "/usr/lib*/pypy3/include"
+fi
test_var PYTHON_PKG_DEP pypy3 '*virtual/pypy3*:0='
test_var PYTHON_SCRIPTDIR pypy3 /usr/lib/python-exec/pypy3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/
@ 2015-11-08 8:42 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2015-11-08 8:42 UTC (permalink / raw
To: gentoo-commits
commit: ef8fdec4d6e6b81881a1c7fb1a6687e2b0ae8bd0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 08:37:04 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 8 08:40:11 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef8fdec4
python-utils-r1.eclass: Switch tests to use python3.4
Use Python 3.4 during tests since Python 3.3 is now deprecated and is
less likely to be installed on user's systems and some tests will
require Python installed.
eclass/tests/python-utils-r1.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e49636a..bd05e9e 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -69,13 +69,13 @@ 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_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
-test_var EPYTHON python3_3 python3.3
-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_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
+test_var EPYTHON python3_4 python3.4
+test_var PYTHON python3_4 /usr/bin/python3.4
+test_var PYTHON_SITEDIR python3_4 /usr/lib/python3.4/site-packages
+test_var PYTHON_INCLUDEDIR python3_4 /usr/include/python3.4
+test_var PYTHON_LIBPATH python3_4 /usr/lib/libpython3.4$(get_libname)
+test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
+test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4
test_var EPYTHON jython2_7 jython2.7
test_var PYTHON jython2_7 /usr/bin/jython2.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/
@ 2015-11-10 17:53 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2015-11-10 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 188cbc2a5c1ab67a4d37e4609cc53a94fe829751
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 8 08:37:04 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 17:40:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=188cbc2a
python-utils-r1.eclass: Switch tests to use python3.4
Use Python 3.4 during tests since Python 3.3 is now deprecated and is
less likely to be installed on user's systems and some tests will
require Python installed.
eclass/tests/python-utils-r1.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index e49636a..bd05e9e 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -69,13 +69,13 @@ 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_SCRIPTDIR python2_7 /usr/lib/python-exec/python2.7
-test_var EPYTHON python3_3 python3.3
-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_SCRIPTDIR python3_3 /usr/lib/python-exec/python3.3
+test_var EPYTHON python3_4 python3.4
+test_var PYTHON python3_4 /usr/bin/python3.4
+test_var PYTHON_SITEDIR python3_4 /usr/lib/python3.4/site-packages
+test_var PYTHON_INCLUDEDIR python3_4 /usr/include/python3.4
+test_var PYTHON_LIBPATH python3_4 /usr/lib/libpython3.4$(get_libname)
+test_var PYTHON_PKG_DEP python3_4 '*dev-lang/python*:3.4'
+test_var PYTHON_SCRIPTDIR python3_4 /usr/lib/python-exec/python3.4
test_var EPYTHON jython2_7 jython2.7
test_var PYTHON jython2_7 /usr/bin/jython2.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-10 17:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-07 9:40 [gentoo-commits] repo/gentoo:python-soabi-cleanup commit in: eclass/tests/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2015-11-08 8:42 Michał Górny
2015-11-10 17:53 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox